You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ru...@apache.org on 2008/05/08 11:39:16 UTC
svn commit: r654458 -
/synapse/branches/1.2/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
Author: ruwan
Date: Thu May 8 02:39:16 2008
New Revision: 654458
URL: http://svn.apache.org/viewvc?rev=654458&view=rev
Log:
Fixing the issue SYNAPSE-294 (just a null check)
Modified:
synapse/branches/1.2/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
Modified: synapse/branches/1.2/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java
URL: http://svn.apache.org/viewvc/synapse/branches/1.2/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java?rev=654458&r1=654457&r2=654458&view=diff
==============================================================================
--- synapse/branches/1.2/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java (original)
+++ synapse/branches/1.2/modules/transports/src/main/java/org/apache/synapse/transport/base/BaseUtils.java Thu May 8 02:39:16 2008
@@ -194,16 +194,19 @@
* @param contentType
* @throws AxisFault on errors encountered while setting the envelope to the message context
*/
- public void setSOAPEnvelope(Object message, MessageContext msgContext, String contentType) throws AxisFault {
+ public void setSOAPEnvelope(Object message, MessageContext msgContext, String contentType)
+ throws AxisFault {
SOAPEnvelope envelope = null;
StAXBuilder builder = null;
- String charSetEnc;
+ String charSetEnc = null;
try {
- charSetEnc = new ContentType(contentType).getParameter("charset");
+ if (contentType != null) {
+ charSetEnc = new ContentType(contentType).getParameter("charset");
+ }
} catch (ParseException ex) {
- charSetEnc = null;
+ // ignore
}
InputStream in = getInputStream(message);
@@ -223,7 +226,9 @@
} catch (Exception ignore) {
try {
in.close();
- } catch (IOException e) {}
+ } catch (IOException e) {
+ // ignore
+ }
in = getInputStream(message);
}
@@ -282,7 +287,7 @@
private SOAPEnvelope handleLegacyMessage(MessageContext msgContext, Object message) {
SOAPFactory soapFactory = new SOAP11Factory();
- SOAPEnvelope envelope = null;
+ SOAPEnvelope envelope;
if (log.isDebugEnabled()) {
log.debug("Non SOAP/XML message received");
@@ -411,8 +416,8 @@
} else {
List transports = service.getExposedTransports();
- for (int i = 0; i < transports.size(); i++) {
- if (transportName.equals(transports.get(i))) {
+ for (Object transport : transports) {
+ if (transportName.equals(transport)) {
return true;
}
}