Author: indika
Date: Wed Mar 7 23:01:49 2007
New Revision: 515947
URL: http://svn.apache.org/viewvc?view=rev&rev=515947
Log:
fixed a minor issue when getting Remote IPAddress
A fix for issue In JIRA SYNAPSE-57
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java?view=diff&rev=515947&r1=515946&r2=515947
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/GetPropertyFunction.java
Wed Mar 7 23:01:49 2007
@@ -126,8 +126,8 @@
org.apache.axis2.context.MessageContext axis2MessageContext
= ((Axis2MessageContext) synCtx).getAxis2MessageContext();
return
axis2MessageContext.getConfigurationContext().getProperty(key);
- } else
- if (Constants.SCOPE_TRANSPORT.equals(scope) && synCtx instanceof
Axis2MessageContext) {
+ } else if (Constants.SCOPE_TRANSPORT.equals(scope)
+ && synCtx instanceof Axis2MessageContext) {
org.apache.axis2.context.MessageContext axis2MessageContext
= ((Axis2MessageContext) synCtx).getAxis2MessageContext();
Object headers = axis2MessageContext.getProperty(
Modified:
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java?view=diff&rev=515947&r1=515946&r2=515947
==============================================================================
---
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
(original)
+++
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/SendMediator.java
Wed Mar 7 23:01:49 2007
@@ -76,7 +76,7 @@
trace.trace("End : Send mediator");
}
}
- return false;
+ return true;
}
public Endpoint getEndpoint() {
Modified:
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java?view=diff&rev=515947&r1=515946&r2=515947
==============================================================================
---
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java
(original)
+++
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java
Wed Mar 7 23:01:49 2007
@@ -130,7 +130,10 @@
// find the remote party IP address and set it to the message context
if (conn instanceof HttpInetConnection) {
HttpInetConnection inetConn = (HttpInetConnection) conn;
- msgContext.setProperty(MessageContext.REMOTE_ADDR,
inetConn.getRemoteAddress());
+ InetAddress remoteAddr = inetConn.getRemoteAddress();
+ if (remoteAddr != null) {
+ msgContext.setProperty(MessageContext.REMOTE_ADDR,
remoteAddr.getHostAddress());
+ }
}
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
