Author: hiranya
Date: Tue Oct 5 18:03:27 2010
New Revision: 1004742
URL: http://svn.apache.org/viewvc?rev=1004742&view=rev
Log:
Refactoring
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/SSLClientIOEventDispatch.java
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java?rev=1004742&r1=1004741&r2=1004742&view=diff
==============================================================================
---
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
(original)
+++
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/Axis2HttpRequest.java
Tue Oct 5 18:03:27 2010
@@ -208,9 +208,10 @@ public class Axis2HttpRequest {
// set any transport headers
Object o = msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (o != null && o instanceof Map) {
- Map headers = (Map) o;
- for (Object header : headers.keySet()) {
- Object value = headers.get(header);
+ Map<?,?> headers = (Map) o;
+ for (Map.Entry entry : headers.entrySet()) {
+ Object header = entry.getKey();
+ Object value = entry.getValue();
if (header instanceof String && value != null && value
instanceof String) {
if (!HTTPConstants.HEADER_HOST.equalsIgnoreCase((String)
header)) {
httpRequest.setHeader((String) header, (String) value);
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java?rev=1004742&r1=1004741&r2=1004742&view=diff
==============================================================================
---
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
(original)
+++
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ClientHandler.java
Tue Oct 5 18:03:27 2010
@@ -542,13 +542,11 @@ public class ClientHandler implements NH
// reset metrics on connection
conn.getMetrics().reset();
if (context.getAttribute(NhttpConstants.DISCARD_ON_COMPLETE)
!= null) {
- try {
- // this is a connection we should not re-use
- ConnectionPool.forget(conn);
- shutdownConnection(conn);
- context.removeAttribute(RESPONSE_SINK_BUFFER);
- context.removeAttribute(REQUEST_SOURCE_BUFFER);
- } catch (Exception ignore) {}
+ // this is a connection we should not re-use
+ ConnectionPool.forget(conn);
+ shutdownConnection(conn);
+ context.removeAttribute(RESPONSE_SINK_BUFFER);
+ context.removeAttribute(REQUEST_SOURCE_BUFFER);
} else if (!connStrategy.keepAlive(response, context)) {
shutdownConnection(conn);
context.removeAttribute(RESPONSE_SINK_BUFFER);
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java?rev=1004742&r1=1004741&r2=1004742&view=diff
==============================================================================
---
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
(original)
+++
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/HttpCoreNIOSender.java
Tue Oct 5 18:03:27 2010
@@ -476,12 +476,11 @@ public class HttpCoreNIOSender extends A
response.setStatusCode(determineHttpStatusCode(msgContext, response));
// set any transport headers
- Map transportHeaders = (Map)
msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
+ Map<?,?> transportHeaders = (Map)
msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (transportHeaders != null && !transportHeaders.values().isEmpty()) {
- Iterator iter = transportHeaders.keySet().iterator();
- while (iter.hasNext()) {
- Object header = iter.next();
- Object value = transportHeaders.get(header);
+ for (Map.Entry entry : transportHeaders.entrySet()) {
+ Object header = entry.getKey();
+ Object value = entry.getValue();
if (value != null && header instanceof String && value
instanceof String) {
response.setHeader((String) header, (String) value);
}
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/SSLClientIOEventDispatch.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/SSLClientIOEventDispatch.java?rev=1004742&r1=1004741&r2=1004742&view=diff
==============================================================================
---
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/SSLClientIOEventDispatch.java
(original)
+++
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/SSLClientIOEventDispatch.java
Tue Oct 5 18:03:27 2010
@@ -16,6 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
+
package org.apache.synapse.transport.nhttp;
import javax.net.ssl.SSLContext;
@@ -26,6 +27,8 @@ import org.apache.http.nio.NHttpClientHa
import org.apache.http.nio.NHttpClientIOTarget;
import org.apache.http.nio.reactor.IOSession;
import org.apache.http.params.HttpParams;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import java.net.InetSocketAddress;
import java.util.Map;
@@ -38,6 +41,8 @@ import java.util.Map;
public class SSLClientIOEventDispatch
extends org.apache.http.impl.nio.SSLClientIOEventDispatch {
+ private static final Log log =
LogFactory.getLog(SSLClientIOEventDispatch.class);
+
private Map<String, SSLContext> contextMap;
public SSLClientIOEventDispatch(
@@ -55,15 +60,22 @@ public class SSLClientIOEventDispatch
protected SSLIOSession createSSLIOSession(IOSession ioSession, SSLContext
sslContext,
SSLIOSessionHandler
sslioSessionHandler) {
- InetSocketAddress address = (InetSocketAddress)
ioSession.getRemoteAddress();
- String host = address.getHostName() + ":" + address.getPort();
SSLContext customContext = null;
if (contextMap != null) {
// See if there's a custom SSL profile configured for this server
+ InetSocketAddress address = (InetSocketAddress)
ioSession.getRemoteAddress();
+ String host = address.getHostName() + ":" + address.getPort();
customContext = contextMap.get(host);
+
+ if (log.isDebugEnabled() && customContext != null) {
+ log.debug("Custom SSL context found for the server: " + host);
+ }
}
if (customContext == null) {
+ if (log.isDebugEnabled()) {
+ log.debug("Using default SSL context for the outbound
connection");
+ }
customContext = sslContext;
}
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java?rev=1004742&r1=1004741&r2=1004742&view=diff
==============================================================================
---
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
(original)
+++
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerHandler.java
Tue Oct 5 18:03:27 2010
@@ -474,9 +474,7 @@ public class ServerHandler implements NH
ByteArrayEntity entity = new ByteArrayEntity(msg);
entity.setContentType("text/plain; charset=US-ASCII");
response.setEntity(entity);
- try {
- commitResponseHideExceptions(conn, response);
- } catch (Exception ignore) {}
+ commitResponseHideExceptions(conn, response);
}
/**
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java?rev=1004742&r1=1004741&r2=1004742&view=diff
==============================================================================
---
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
(original)
+++
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/ServerWorker.java
Tue Oct 5 18:03:27 2010
@@ -312,8 +312,8 @@ public class ServerWorker implements Run
Map<String, String> responseHeaders = (Map<String, String>)
msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (responseHeaders != null) {
- for (String headerName : responseHeaders.keySet()) {
- response.addHeader(headerName,
responseHeaders.get(headerName));
+ for (Map.Entry<String, String> entry :
responseHeaders.entrySet()) {
+ response.addHeader(entry.getKey(),
entry.getValue());
}
}
}
Modified:
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
URL:
http://svn.apache.org/viewvc/synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java?rev=1004742&r1=1004741&r2=1004742&view=diff
==============================================================================
---
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
(original)
+++
synapse/branches/2.0/modules/transports/core/nhttp/src/main/java/org/apache/synapse/transport/nhttp/util/RESTUtil.java
Tue Oct 5 18:03:27 2010
@@ -22,7 +22,6 @@ package org.apache.synapse.transport.nht
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.impl.llom.soap11.SOAP11Factory;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.AxisService;
