You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2006/11/24 05:13:37 UTC
svn commit: r478761 - in /webservices/axis2/branches/java/1_1/modules:
addressing/src/org/apache/axis2/handlers/addressing/
kernel/src/org/apache/axis2/transport/
kernel/src/org/apache/axis2/transport/http/
Author: dims
Date: Thu Nov 23 20:13:36 2006
New Revision: 478761
URL: http://svn.apache.org/viewvc?view=rev&rev=478761
Log:
apply perf-001.txt patch in AXIS2-1769
Modified:
webservices/axis2/branches/java/1_1/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
Modified: webservices/axis2/branches/java/1_1/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java?view=diff&rev=478761&r1=478760&r2=478761
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java (original)
+++ webservices/axis2/branches/java/1_1/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingInHandler.java Thu Nov 23 20:13:36 2006
@@ -43,12 +43,12 @@
private static final long serialVersionUID = 3907988439637261572L;
private static final Log log = LogFactory.getLog(AddressingInHandler.class);
-
+ private static final boolean isDebugEnabled = log.isDebugEnabled();
public InvocationResponse invoke(MessageContext msgContext) throws AxisFault {
// if another handler has already processed the addressing headers, do not do anything here.
if (JavaUtils.isTrueExplicitly(msgContext.getProperty(IS_ADDR_INFO_ALREADY_PROCESSED))) {
- if(log.isDebugEnabled()) {
+ if(isDebugEnabled) {
log.debug("Another handler has processed the addressing headers. Nothing to do here.");
}
@@ -61,7 +61,7 @@
namespace = addressingNamespace;
}
else if (!namespace.equals(addressingNamespace)) {
- if(log.isDebugEnabled()) {
+ if(isDebugEnabled) {
log.debug("This addressing handler does not match the specified namespace, " + namespace);
}
@@ -79,7 +79,7 @@
return InvocationResponse.CONTINUE;
}
- if(log.isDebugEnabled()) {
+ if(isDebugEnabled) {
log.debug("Starting " + addressingVersion + " IN handler ...");
}
@@ -89,14 +89,14 @@
msgContext.setProperty(WS_ADDRESSING_VERSION, namespace);
msgContext.setProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.FALSE);
- if(log.isDebugEnabled()) {
+ if(isDebugEnabled) {
log.debug(addressingVersion + " Headers present in the SOAP message. Starting to process ...");
}
extractAddressingInformation(header, msgContext, addressingHeaders, namespace);
msgContext.setProperty(IS_ADDR_INFO_ALREADY_PROCESSED, Boolean.TRUE);
} else {
msgContext.setProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES, Boolean.TRUE);
- if(log.isDebugEnabled()) {
+ if(isDebugEnabled) {
log.debug("No Headers present corresponding to " + addressingVersion);
}
}
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java?view=diff&rev=478761&r1=478760&r2=478761
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/TransportUtils.java Thu Nov 23 20:13:36 2006
@@ -157,7 +157,9 @@
}
// There might be "" around the value - if so remove them
- value = value.replaceAll("\"", "");
+ if(value.indexOf('\"')!=-1){
+ value = value.replaceAll("\"", "");
+ }
if ("null".equalsIgnoreCase(value)) {
return null;
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java?view=diff&rev=478761&r1=478760&r2=478761
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPConstants.java Thu Nov 23 20:13:36 2006
@@ -431,6 +431,7 @@
public static final String HEADER_ACCEPT_ENCODING = "Accept-Encoding";
public static final String HEADER_CONTENT_ENCODING = "Content-Encoding";
+ public static final String HEADER_CONTENT_ENCODING_LOWERCASE = HEADER_CONTENT_ENCODING.toLowerCase();
public static final String COMPRESSION_GZIP = "gzip";
Modified: webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java?view=diff&rev=478761&r1=478760&r2=478761
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java (original)
+++ webservices/axis2/branches/java/1_1/modules/kernel/src/org/apache/axis2/transport/http/HTTPTransportUtils.java Thu Nov 23 20:13:36 2006
@@ -166,7 +166,7 @@
Map headers = (Map) msgContext.getProperty(MessageContext.TRANSPORT_HEADERS);
if (headers != null) {
if (HTTPConstants.COMPRESSION_GZIP.equals(headers.get(HTTPConstants.HEADER_CONTENT_ENCODING)) ||
- HTTPConstants.COMPRESSION_GZIP.equals(headers.get(HTTPConstants.HEADER_CONTENT_ENCODING.toLowerCase())))
+ HTTPConstants.COMPRESSION_GZIP.equals(headers.get(HTTPConstants.HEADER_CONTENT_ENCODING_LOWERCASE)))
{
in = new GZIPInputStream(in);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org