Collapse identical catch branches.

hduelme · gregturn · commit bde18f52af27 · 2022-11-16T11:00:16.000-06:00
Also take advantage of Java's try-with-resources feature. Resolves #1248.
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java b/spring-ws-core/src/main/java/org/springframework/ws/client/core/WebServiceTemplate.java
@@ -611,11 +611,7 @@ protected <T> T doSendAndReceive(MessageContext messageContext, WebServiceConnec
 		} catch (TransformerException ex) {
 			triggerAfterCompletion(interceptorIndex, messageContext, ex);
 			throw new WebServiceTransformerException("Transformation error: " + ex.getMessage(), ex);
-		} catch (RuntimeException ex) {
-			// Trigger after-completion for thrown exception.
-			triggerAfterCompletion(interceptorIndex, messageContext, ex);
-			throw ex;
-		} catch (IOException ex) {
+		} catch (RuntimeException | IOException ex) {
 			// Trigger after-completion for thrown exception.
 			triggerAfterCompletion(interceptorIndex, messageContext, ex);
 			throw ex;
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxEventPayloadEndpoint.java
@@ -102,10 +102,8 @@ private XMLEventReader getEventReader(Source source) throws XMLStreamException,
 		if (eventReader == null) {
 			try {
 				eventReader = getInputFactory().createXMLEventReader(source);
-			} catch (XMLStreamException ex) {
-				eventReader = null;
-			} catch (UnsupportedOperationException ex) {
-				eventReader = null;
+			} catch (XMLStreamException | UnsupportedOperationException ex) {
+				// ignore
 			}
 		}
 		if (eventReader == null) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractStaxStreamPayloadEndpoint.java
@@ -79,10 +79,8 @@ private XMLStreamReader getStreamReader(Source source) throws XMLStreamException
 		if (streamReader == null) {
 			try {
 				streamReader = getInputFactory().createXMLStreamReader(source);
-			} catch (XMLStreamException ex) {
-				streamReader = null;
-			} catch (UnsupportedOperationException ex) {
-				streamReader = null;
+			} catch (XMLStreamException | UnsupportedOperationException ex) {
+				// ignore
 			}
 		}
 		if (streamReader == null) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/AbstractXomPayloadEndpoint.java
@@ -133,7 +133,7 @@ public void domSource(Node node) {
 		}
 
 		@Override
-		public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException {
+		public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException, ParsingException {
 			try {
 				Builder builder = new Builder(reader);
 				Document document;
@@ -148,8 +148,6 @@ public void saxSource(XMLReader reader, InputSource inputSource) throws IOExcept
 				element = document.getRootElement();
 			} catch (ValidityException ex) {
 				throw new XomParsingException(ex);
-			} catch (ParsingException ex) {
-				throw new XomParsingException(ex);
 			}
 		}
 
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/SourcePayloadMethodProcessor.java
@@ -81,9 +81,7 @@ protected Source resolveRequestPayloadArgument(MethodParameter parameter, Source
 			XMLStreamReader streamReader;
 			try {
 				streamReader = inputFactory.createXMLStreamReader(requestPayload);
-			} catch (UnsupportedOperationException ignored) {
-				streamReader = null;
-			} catch (XMLStreamException ignored) {
+			} catch (UnsupportedOperationException | XMLStreamException ignored) {
 				streamReader = null;
 			}
 			if (streamReader == null) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/adapter/method/StaxPayloadMethodArgumentResolver.java
@@ -81,18 +81,16 @@ private XMLStreamReader resolveStreamReader(Source requestSource) throws Transfo
 					try {
 						streamReader = StaxUtils.createEventStreamReader(eventReader);
 					} catch (XMLStreamException ex) {
-						streamReader = null;
+						// ignore
 					}
 				}
 			}
 		}
 		if (streamReader == null) {
 			try {
 				streamReader = inputFactory.createXMLStreamReader(requestSource);
-			} catch (XMLStreamException ex) {
-				streamReader = null;
-			} catch (UnsupportedOperationException ex) {
-				streamReader = null;
+			} catch (XMLStreamException | UnsupportedOperationException ex) {
+				// ignore
 			}
 		}
 		if (streamReader == null) {
@@ -113,7 +111,7 @@ private XMLEventReader resolveEventReader(Source requestSource) throws Transform
 					try {
 						eventReader = inputFactory.createXMLEventReader(streamReader);
 					} catch (XMLStreamException ex) {
-						eventReader = null;
+						// ignore
 					}
 				}
 
@@ -122,10 +120,8 @@ private XMLEventReader resolveEventReader(Source requestSource) throws Transform
 		if (eventReader == null) {
 			try {
 				eventReader = inputFactory.createXMLEventReader(requestSource);
-			} catch (XMLStreamException ex) {
-				eventReader = null;
-			} catch (UnsupportedOperationException ex) {
-				eventReader = null;
+			} catch (XMLStreamException | UnsupportedOperationException ex) {
+				// ignore
 			}
 		}
 		if (eventReader == null) {
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java b/spring-ws-core/src/main/java/org/springframework/ws/server/endpoint/mapping/jaxb/XmlRootElementEndpointMapping.java
@@ -90,9 +90,7 @@ private QName handleRootElement(Class<?> parameterType) {
 			if (result != null) {
 				return result;
 			}
-		} catch (InstantiationException e) {
-			// ignore
-		} catch (IllegalAccessException ex) {
+		} catch (InstantiationException | IllegalAccessException e) {
 			// ignore
 		}
 		return null;
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/addressing/server/AddressingEndpointInterceptor.java
@@ -147,16 +147,11 @@ private void sendOutOfBand(MessageContext messageContext, EndpointReference repl
 		for (WebServiceMessageSender messageSender : messageSenders) {
 			if (messageSender.supports(replyEpr.getAddress())) {
 				supported = true;
-				WebServiceConnection connection = null;
-				try {
-					connection = messageSender.createConnection(replyEpr.getAddress());
+				try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())){
 					connection.send(messageContext.getResponse());
 					break;
 				} finally {
 					messageContext.clearResponse();
-					if (connection != null) {
-						connection.close();
-					}
 				}
 			}
 		}
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/SaajSoapMessage.java
@@ -185,9 +185,7 @@ public Document getDocument() {
 			SOAPMessage saajMessage = messageFactory.createMessage(getSaajMessage().getMimeHeaders(), bis);
 			setSaajMessage(saajMessage);
 			return saajMessage.getSOAPPart();
-		} catch (SOAPException ex) {
-			throw new SaajSoapMessageException("Could not save changes", ex);
-		} catch (IOException ex) {
+		} catch (SOAPException | IOException ex) {
 			throw new SaajSoapMessageException("Could not save changes", ex);
 		}
 	}
@@ -212,9 +210,7 @@ public void setDocument(Document document) {
 
 				this.saajMessage = messageFactory.createMessage(saajMessage.getMimeHeaders(), bis);
 
-			} catch (SOAPException ex) {
-				throw new SaajSoapMessageException("Could not read input stream", ex);
-			} catch (IOException ex) {
+			} catch (SOAPException | IOException ex) {
 				throw new SaajSoapMessageException("Could not read input stream", ex);
 			}
 		}
diff --git a/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java b/spring-ws-core/src/main/java/org/springframework/ws/soap/saaj/support/SaajUtils.java
@@ -174,14 +174,11 @@ public static QName toQName(Name name) {
 	 */
 	public static SOAPMessage loadMessage(Resource resource, MessageFactory messageFactory)
 			throws SOAPException, IOException {
-		InputStream is = resource.getInputStream();
-		try {
+		try (InputStream is = resource.getInputStream()){
 			MimeHeaders mimeHeaders = new MimeHeaders();
 			mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_TYPE, "text/xml");
 			mimeHeaders.addHeader(TransportConstants.HEADER_CONTENT_LENGTH, Long.toString(resource.getFile().length()));
 			return messageFactory.createMessage(mimeHeaders, is);
-		} finally {
-			is.close();
 		}
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java b/spring-ws-core/src/test/java/org/springframework/ws/transport/http/AbstractHttpWebServiceMessageSenderIntegrationTestCase.java
@@ -194,17 +194,12 @@ public void testSendAndReceiveFault() throws Exception {
 		jettyServer.setHandler(jettyContext);
 		jettyServer.start();
 
-		FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
-				.createConnection(connectionUri);
-		SOAPMessage request = createRequest();
-
-		try {
-			connection.send(new SaajSoapMessage(request));
+		try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
+				.createConnection(connectionUri)){
+			connection.send(new SaajSoapMessage(createRequest()));
 			connection.receive(messageFactory);
 
 			assertThat(connection.hasFault()).isTrue();
-		} finally {
-			connection.close();
 		}
 	}
 
@@ -213,12 +208,10 @@ private void validateResponse(Servlet servlet) throws Exception {
 		jettyContext.addServlet(new ServletHolder(servlet), "/");
 		jettyServer.setHandler(jettyContext);
 		jettyServer.start();
-		FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
-				.createConnection(connectionUri);
-		SOAPMessage request = createRequest();
 
-		try {
-			connection.send(new SaajSoapMessage(request));
+		try (FaultAwareWebServiceConnection connection = (FaultAwareWebServiceConnection) messageSender
+				.createConnection(connectionUri)){
+			connection.send(new SaajSoapMessage(createRequest()));
 			SaajSoapMessage response = (SaajSoapMessage) connection.receive(messageFactory);
 
 			assertThat(response).isNotNull();
@@ -235,8 +228,6 @@ private void validateResponse(Servlet servlet) throws Exception {
 			transformer.transform(response.getPayloadSource(), result);
 
 			XmlAssert.assertThat(result.toString()).and(RESPONSE).ignoreWhitespace().areIdentical();
-		} finally {
-			connection.close();
 		}
 	}
 
@@ -246,16 +237,11 @@ private void validateNonResponse(Servlet servlet) throws Exception {
 		jettyServer.setHandler(jettyContext);
 		jettyServer.start();
 
-		WebServiceConnection connection = messageSender.createConnection(connectionUri);
-		SOAPMessage request = createRequest();
-
-		try {
-			connection.send(new SaajSoapMessage(request));
+		try (WebServiceConnection connection = messageSender.createConnection(connectionUri)){
+			connection.send(new SaajSoapMessage(createRequest()));
 			WebServiceMessage response = connection.receive(messageFactory);
 
 			assertThat(response).isNull();
-		} finally {
-			connection.close();
 		}
 	}
 
diff --git a/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java b/spring-ws-core/src/test/java/org/springframework/ws/wsdl/wsdl11/Wsdl4jDefinitionTest.java
@@ -37,31 +37,28 @@
 import org.xml.sax.InputSource;
 import org.xmlunit.assertj.XmlAssert;
 
-public class Wsdl4jDefinitionTest {
+class Wsdl4jDefinitionTest {
 
 	private Wsdl4jDefinition definition;
 
 	private Transformer transformer;
 
 	@BeforeEach
-	public void setUp() throws Exception {
+	void setUp() throws Exception {
 
 		WSDLFactory factory = WSDLFactory.newInstance();
 		WSDLReader reader = factory.newWSDLReader();
-		InputStream is = getClass().getResourceAsStream("complete.wsdl");
 
-		try {
+		try (InputStream is = getClass().getResourceAsStream("complete.wsdl")){
 			Definition wsdl4jDefinition = reader.readWSDL(null, new InputSource(is));
 			definition = new Wsdl4jDefinition(wsdl4jDefinition);
-		} finally {
-			is.close();
 		}
 
 		transformer = TransformerFactoryUtils.newInstance().newTransformer();
 	}
 
 	@Test
-	public void testGetSource() throws Exception {
+	void testGetSource() throws Exception {
 
 		Source source = definition.getSource();
 
diff --git a/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java b/spring-ws-security/src/main/java/org/springframework/ws/soap/security/wss4j2/callback/KeyStoreCallbackHandler.java
@@ -72,11 +72,7 @@ protected void handleSecretKey(WSPasswordCallback callback) throws IOException,
 
 		try {
 			key = keyStore.getKey(id, symmetricKeyPassword != null ? symmetricKeyPassword : privateKeyPassword.toCharArray());
-		} catch (UnrecoverableKeyException e) {
-			throw new IOException("Could not get key", e);
-		} catch (KeyStoreException e) {
-			throw new IOException("Could not get key", e);
-		} catch (NoSuchAlgorithmException e) {
+		} catch (UnrecoverableKeyException | KeyStoreException | NoSuchAlgorithmException e) {
 			throw new IOException("Could not get key", e);
 		}
 
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/http/HttpsUrlConnectionMessageSender.java
@@ -163,9 +163,7 @@ private SSLSocketFactory createSslSocketFactory() throws HttpsTransportException
 						+ StringUtils.arrayToCommaDelimitedString(trustManagers) + "] secure random [" + rnd + "]");
 			}
 			return sslContext.getSocketFactory();
-		} catch (NoSuchAlgorithmException ex) {
-			throw new HttpsTransportException("Could not create SSLContext: " + ex.getMessage(), ex);
-		} catch (NoSuchProviderException ex) {
+		} catch (NoSuchAlgorithmException | NoSuchProviderException ex) {
 			throw new HttpsTransportException("Could not create SSLContext: " + ex.getMessage(), ex);
 		} catch (KeyManagementException ex) {
 			throw new HttpsTransportException("Could not initialize SSLContext: " + ex.getMessage(), ex);
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppReceiverConnection.java
@@ -142,9 +142,7 @@ protected OutputStream getResponseOutputStream() throws IOException {
 	protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
 		try {
 			connection.sendStanza(responseMessage);
-		} catch (SmackException.NotConnectedException e) {
-			throw new IOException(e);
-		} catch (InterruptedException e) {
+		} catch (SmackException.NotConnectedException | InterruptedException e) {
 			throw new IOException(e);
 		}
 	}
diff --git a/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java b/spring-ws-support/src/main/java/org/springframework/ws/transport/xmpp/XmppSenderConnection.java
@@ -137,9 +137,7 @@ protected void onSendAfterWrite(WebServiceMessage message) throws IOException {
 		requestMessage.setFrom(connection.getUser());
 		try {
 			connection.sendStanza(requestMessage);
-		} catch (SmackException.NotConnectedException e) {
-			throw new IOException(e);
-		} catch (InterruptedException e) {
+		} catch (SmackException.NotConnectedException | InterruptedException e) {
 			throw new IOException(e);
 		}
 	}
diff --git a/spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java b/spring-xml/src/main/java/org/springframework/xml/sax/SaxUtils.java
@@ -55,10 +55,7 @@ public static InputSource createInputSource(Resource resource) throws IOExceptio
 	public static String getSystemId(Resource resource) {
 		try {
 			return new URI(resource.getURL().toExternalForm()).toString();
-		} catch (IOException ex) {
-			logger.debug("Could not get System ID from [" + resource + "], ex");
-			return null;
-		} catch (URISyntaxException e) {
+		} catch (IOException | URISyntaxException ex) {
 			logger.debug("Could not get System ID from [" + resource + "], ex");
 			return null;
 		}
diff --git a/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java b/spring-xml/src/main/java/org/springframework/xml/xsd/commons/CommonsXsdSchema.java
@@ -98,9 +98,7 @@ public Source getSource() {
 			}
 			Document[] serializedSchemas = serializer.serializeSchema(schema, false);
 			return new DOMSource(serializedSchemas[0]);
-		} catch (BeanInstantiationException ex) {
-			// ignore
-		} catch (XmlSchemaSerializer.XmlSchemaSerializerException ex) {
+		} catch (BeanInstantiationException | XmlSchemaSerializer.XmlSchemaSerializerException ex) {
 			// ignore
 		}
 		ByteArrayOutputStream bos = new ByteArrayOutputStream();

Original file line number	Diff line number	Diff line change
`@@ -102,10 +102,8 @@ private XMLEventReader getEventReader(Source source) throws XMLStreamException,`
`102`	`102`	`if (eventReader == null) {`
`103`	`103`	`try {`
`104`	`104`	`eventReader = getInputFactory().createXMLEventReader(source);`
`105`		`- } catch (XMLStreamException ex) {`
`106`		`- eventReader = null;`
`107`		`- } catch (UnsupportedOperationException ex) {`
`108`		`- eventReader = null;`
	`105`	`+ } catch (XMLStreamException \| UnsupportedOperationException ex) {`
	`106`	`+ // ignore`
`109`	`107`	`}`
`110`	`108`	`}`
`111`	`109`	`if (eventReader == null) {`
Original file line number	Diff line number	Diff line change
`@@ -79,10 +79,8 @@ private XMLStreamReader getStreamReader(Source source) throws XMLStreamException`
`79`	`79`	`if (streamReader == null) {`
`80`	`80`	`try {`
`81`	`81`	`streamReader = getInputFactory().createXMLStreamReader(source);`
`82`		`- } catch (XMLStreamException ex) {`
`83`		`- streamReader = null;`
`84`		`- } catch (UnsupportedOperationException ex) {`
`85`		`- streamReader = null;`
	`82`	`+ } catch (XMLStreamException \| UnsupportedOperationException ex) {`
	`83`	`+ // ignore`
`86`	`84`	`}`
`87`	`85`	`}`
`88`	`86`	`if (streamReader == null) {`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public void domSource(Node node) {`
`133`	`133`	`}`
`134`	`134`
`135`	`135`	`@Override`
`136`		`- public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException {`
	`136`	`+ public void saxSource(XMLReader reader, InputSource inputSource) throws IOException, SAXException, ParsingException {`
`137`	`137`	`try {`
`138`	`138`	`Builder builder = new Builder(reader);`
`139`	`139`	`Document document;`
`@@ -148,8 +148,6 @@ public void saxSource(XMLReader reader, InputSource inputSource) throws IOExcept`
`148`	`148`	`element = document.getRootElement();`
`149`	`149`	`} catch (ValidityException ex) {`
`150`	`150`	`throw new XomParsingException(ex);`
`151`		`- } catch (ParsingException ex) {`
`152`		`- throw new XomParsingException(ex);`
`153`	`151`	`}`
`154`	`152`	`}`
`155`	`153`
Original file line number	Diff line number	Diff line change
`@@ -81,18 +81,16 @@ private XMLStreamReader resolveStreamReader(Source requestSource) throws Transfo`
`81`	`81`	`try {`
`82`	`82`	`streamReader = StaxUtils.createEventStreamReader(eventReader);`
`83`	`83`	`} catch (XMLStreamException ex) {`
`84`		`- streamReader = null;`
	`84`	`+ // ignore`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`	`if (streamReader == null) {`
`90`	`90`	`try {`
`91`	`91`	`streamReader = inputFactory.createXMLStreamReader(requestSource);`
`92`		`- } catch (XMLStreamException ex) {`
`93`		`- streamReader = null;`
`94`		`- } catch (UnsupportedOperationException ex) {`
`95`		`- streamReader = null;`
	`92`	`+ } catch (XMLStreamException \| UnsupportedOperationException ex) {`
	`93`	`+ // ignore`
`96`	`94`	`}`
`97`	`95`	`}`
`98`	`96`	`if (streamReader == null) {`
`@@ -113,7 +111,7 @@ private XMLEventReader resolveEventReader(Source requestSource) throws Transform`
`113`	`111`	`try {`
`114`	`112`	`eventReader = inputFactory.createXMLEventReader(streamReader);`
`115`	`113`	`} catch (XMLStreamException ex) {`
`116`		`- eventReader = null;`
	`114`	`+ // ignore`
`117`	`115`	`}`
`118`	`116`	`}`
`119`	`117`
`@@ -122,10 +120,8 @@ private XMLEventReader resolveEventReader(Source requestSource) throws Transform`
`122`	`120`	`if (eventReader == null) {`
`123`	`121`	`try {`
`124`	`122`	`eventReader = inputFactory.createXMLEventReader(requestSource);`
`125`		`- } catch (XMLStreamException ex) {`
`126`		`- eventReader = null;`
`127`		`- } catch (UnsupportedOperationException ex) {`
`128`		`- eventReader = null;`
	`123`	`+ } catch (XMLStreamException \| UnsupportedOperationException ex) {`
	`124`	`+ // ignore`
`129`	`125`	`}`
`130`	`126`	`}`
`131`	`127`	`if (eventReader == null) {`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,7 @@ private QName handleRootElement(Class<?> parameterType) {`
`90`	`90`	`if (result != null) {`
`91`	`91`	`return result;`
`92`	`92`	`}`
`93`		`- } catch (InstantiationException e) {`
`94`		`- // ignore`
`95`		`- } catch (IllegalAccessException ex) {`
	`93`	`+ } catch (InstantiationException \| IllegalAccessException e) {`
`96`	`94`	`// ignore`
`97`	`95`	`}`
`98`	`96`	`return null;`
Original file line number	Diff line number	Diff line change
`@@ -147,16 +147,11 @@ private void sendOutOfBand(MessageContext messageContext, EndpointReference repl`
`147`	`147`	`for (WebServiceMessageSender messageSender : messageSenders) {`
`148`	`148`	`if (messageSender.supports(replyEpr.getAddress())) {`
`149`	`149`	`supported = true;`
`150`		`- WebServiceConnection connection = null;`
`151`		`- try {`
`152`		`- connection = messageSender.createConnection(replyEpr.getAddress());`
	`150`	`+ try (WebServiceConnection connection = messageSender.createConnection(replyEpr.getAddress())){`
`153`	`151`	`connection.send(messageContext.getResponse());`
`154`	`152`	`break;`
`155`	`153`	`} finally {`
`156`	`154`	`messageContext.clearResponse();`
`157`		`- if (connection != null) {`
`158`		`- connection.close();`
`159`		`- }`
`160`	`155`	`}`
`161`	`156`	`}`
`162`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -185,9 +185,7 @@ public Document getDocument() {`
`185`	`185`	`SOAPMessage saajMessage = messageFactory.createMessage(getSaajMessage().getMimeHeaders(), bis);`
`186`	`186`	`setSaajMessage(saajMessage);`
`187`	`187`	`return saajMessage.getSOAPPart();`
`188`		`- } catch (SOAPException ex) {`
`189`		`- throw new SaajSoapMessageException("Could not save changes", ex);`
`190`		`- } catch (IOException ex) {`
	`188`	`+ } catch (SOAPException \| IOException ex) {`
`191`	`189`	`throw new SaajSoapMessageException("Could not save changes", ex);`
`192`	`190`	`}`
`193`	`191`	`}`
`@@ -212,9 +210,7 @@ public void setDocument(Document document) {`
`212`	`210`
`213`	`211`	`this.saajMessage = messageFactory.createMessage(saajMessage.getMimeHeaders(), bis);`
`214`	`212`
`215`		`- } catch (SOAPException ex) {`
`216`		`- throw new SaajSoapMessageException("Could not read input stream", ex);`
`217`		`- } catch (IOException ex) {`
	`213`	`+ } catch (SOAPException \| IOException ex) {`
`218`	`214`	`throw new SaajSoapMessageException("Could not read input stream", ex);`
`219`	`215`	`}`
`220`	`216`	`}`