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 2008/03/19 14:33:56 UTC
svn commit: r638826 - in
/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2:
clustering/RequestBlockingHandler.java
context/externalize/ObjectInputStreamWithCL.java
context/externalize/SafeObjectOutputStream.java
Author: dims
Date: Wed Mar 19 06:33:54 2008
New Revision: 638826
URL: http://svn.apache.org/viewvc?rev=638826&view=rev
Log:
Fix for AXIS2-3633 - Improvements in SafeObjectOutputStream
Fix for AXIS2-3632 - ObjectInputStreamWithCL.resolver should not be static because it's updated by instance methods
Fix for AXIS2-3630 - RequestBlockingHandler.invoke uses equals to compare a String and a QName
Modified:
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/RequestBlockingHandler.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ObjectInputStreamWithCL.java
webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/RequestBlockingHandler.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/RequestBlockingHandler.java?rev=638826&r1=638825&r2=638826&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/RequestBlockingHandler.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/clustering/RequestBlockingHandler.java Wed Mar 19 06:33:54 2008
@@ -66,7 +66,7 @@
// Allow only NodeManager service commit requests to pass through. Block all others
AxisService axisService = msgContext.getAxisService();
if (!axisService.getName().equals(ClusteringConstants.NODE_MANAGER_SERVICE)) {
- if (!msgContext.getAxisOperation().getName().equals("commit")) {
+ if (!msgContext.getAxisOperation().getName().getLocalPart().equals("commit")) {
throw new AxisFault("System is being reinitialized. " +
"Please try again in a few seconds.");
} else {
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ObjectInputStreamWithCL.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ObjectInputStreamWithCL.java?rev=638826&r1=638825&r2=638826&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ObjectInputStreamWithCL.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/ObjectInputStreamWithCL.java Wed Mar 19 06:33:54 2008
@@ -56,7 +56,7 @@
/** The class resolver */
- protected static ClassResolver resolver;
+ protected ClassResolver resolver;
static
{
primClasses.put("boolean", boolean.class);
Modified: webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java?rev=638826&r1=638825&r2=638826&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java (original)
+++ webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/context/externalize/SafeObjectOutputStream.java Wed Mar 19 06:33:54 2008
@@ -34,6 +34,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
/**
* A SafeObjectOutputStream provides extra mechanisms to ensure that
@@ -75,7 +76,7 @@
// an NotSerializableException
// note that the Hashtable is synchronized by Java so we shouldn't need to
// do extra control over access to the table
- public static Hashtable notSerializableList = new Hashtable();
+ public static final Hashtable notSerializableList = new Hashtable();
/**
* Add the SafeOutputStream if necessary.
@@ -248,15 +249,11 @@
return false;
} else {
out.writeBoolean(ACTIVE_OBJECT);
- // TODO Change to entry set to avoid second lookup
- Iterator it = map.keySet().iterator();
-
+ Iterator it = map.entrySet().iterator();
while (it.hasNext()) {
- Object key = it.next();
- Object value = map.get(key);
- writePair(key, false, value, false);
- }
- // Empty object indicates end of list
+ final Map.Entry entry = (Entry) it.next();
+ writePair(entry.getKey(), false, entry.getValue(), false);
+ } // Empty object indicates end of list
out.writeBoolean(EMPTY_OBJECT);
}
return true;
@@ -708,7 +705,7 @@
* MyBAOS is a ByteArrayOutputStream with a few additions.
*
*/
- class MyBAOS extends ByteArrayOutputStream {
+ static class MyBAOS extends ByteArrayOutputStream {
/**
* Return direct access to the buffer without creating a copy of the byte[]
* @return buf
@@ -730,12 +727,12 @@
* MyOOS is an ObjectOutputStream with a few performant additions.
*
*/
- class MyOOS extends ObjectOutputStream {
+ static class MyOOS extends ObjectOutputStream {
MyBAOS baos;
int dataOffset;
MyOOS(MyBAOS baos) throws IOException {
super(baos);
- flush();
+ super.flush();
this.baos = baos;
// Capture the data offset
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org