You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2007/02/05 23:10:51 UTC
svn commit: r503895 - in /webservices/axis2/trunk/java/modules/kernel: ./
src/org/apache/axis2/client/ src/org/apache/axis2/context/
src/org/apache/axis2/transport/http/ test-resources/deployment/outservice/
Author: dims
Date: Mon Feb 5 14:10:45 2007
New Revision: 503895
URL: http://svn.apache.org/viewvc?view=rev&rev=503895
Log:
- delay creating linked lists and hash maps
- save TransportInDescription/TransportOutDescription during servlet startup
- remove outservice it does not seem to be used at all
Removed:
webservices/axis2/trunk/java/modules/kernel/test-resources/deployment/outservice/
Modified:
webservices/axis2/trunk/java/modules/kernel/maven.xml
webservices/axis2/trunk/java/modules/kernel/pom.xml
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
Modified: webservices/axis2/trunk/java/modules/kernel/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/maven.xml?view=diff&rev=503895&r1=503894&r2=503895
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/maven.xml Mon Feb 5 14:10:45 2007
@@ -15,7 +15,6 @@
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/service2"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/echo"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/invalidservice"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/outservice"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/module1"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/serviceModule"/>
<ant:ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true" dir="test-resources/"/>
Modified: webservices/axis2/trunk/java/modules/kernel/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/pom.xml?view=diff&rev=503895&r1=503894&r2=503895
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/kernel/pom.xml Mon Feb 5 14:10:45 2007
@@ -171,7 +171,6 @@
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/service2"/>
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/echo"/>
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/invalidservice"/>
- <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/outservice"/>
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/module1"/>
<ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="test-resources/deployment/serviceModule"/>
<copy file="${basedir}/test-resources/deployment/axis2.xml" tofile="${basedir}/target/test-resources/deployment/axis2.xml"/>
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java?view=diff&rev=503895&r1=503894&r2=503895
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/client/Options.java Mon Feb 5 14:10:45 2007
@@ -110,7 +110,7 @@
/**
* @serial properties
*/
- private Map properties = new HashMap();
+ private Map properties;
// ==========================================================================
// Parameters that can be set via Options
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java?view=diff&rev=503895&r1=503894&r2=503895
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/AbstractContext.java Mon Feb 5 14:10:45 2007
@@ -37,7 +37,6 @@
protected transient Map properties;
protected AbstractContext(AbstractContext parent) {
- this.properties = new HashMap();
this.parent = parent;
}
@@ -49,6 +48,9 @@
}
public Map getProperties() {
+ if (this.properties == null) {
+ this.properties = new HashMap();
+ }
return properties;
}
@@ -61,7 +63,7 @@
public Object getProperty(String key) {
Object obj;
- obj = properties.get(key);
+ obj = properties == null ? null : properties.get(key);
if ((obj == null) && (parent != null)) {
obj = parent.getProperty(key);
@@ -132,6 +134,9 @@
* @param value
*/
public void setProperty(String key, Object value) {
+ if (this.properties == null) {
+ this.properties = new HashMap();
+ }
properties.put(key, value);
}
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java?view=diff&rev=503895&r1=503894&r2=503895
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/MessageContext.java Mon Feb 5 14:10:45 2007
@@ -248,17 +248,17 @@
/**
* @serial The chain of Handlers/Phases for processing this message
*/
- private ArrayList executionChain = new ArrayList();
+ private ArrayList executionChain;
/**
* @serial The chain of executed Handlers/Phases from inbound processing
*/
- private LinkedList inboundExecutedPhases = new LinkedList();
+ private LinkedList inboundExecutedPhases;
/**
* @serial The chain of executed Handlers/Phases from outbound processing
*/
- private LinkedList outboundExecutedPhases = new LinkedList();
+ private LinkedList outboundExecutedPhases;
/**
* @serial Flag to indicate if we are doing REST
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java?view=diff&rev=503895&r1=503894&r2=503895
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/AxisServlet.java Mon Feb 5 14:10:45 2007
@@ -86,6 +86,8 @@
private static final String LIST_SERVICES_SUFIX = "/services/listServices";
private static final String LIST_FAUKT_SERVICES_SUFIX = "/services/ListFaultyServices";
private boolean closeReader = true;
+ protected TransportInDescription transportIn;
+ protected TransportOutDescription transportOut;
protected MessageContext
createAndSetInitialParamsToMsgCtxt(HttpServletResponse resp,
@@ -99,10 +101,8 @@
}
msgContext.setConfigurationContext(configContext);
- msgContext.setTransportIn(axisConfiguration.getTransportIn(new QName(Constants
- .TRANSPORT_HTTP)));
- msgContext.setTransportOut(
- axisConfiguration.getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+ msgContext.setTransportIn(transportIn);
+ msgContext.setTransportOut(transportOut);
msgContext.setProperty(Constants.OUT_TRANSPORT_INFO,
new ServletBasedOutTransportInfo(resp));
@@ -524,6 +524,9 @@
if (parameter != null) {
closeReader = JavaUtils.isTrueExplicitly(parameter.getValue());
}
+
+ transportIn = axisConfiguration.getTransportIn(new QName(Constants.TRANSPORT_HTTP));
+ transportOut = axisConfiguration.getTransportOut(new QName(Constants.TRANSPORT_HTTP));
}
public void init() throws ServletException {
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org