svn commit: r385087 - /webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java

[de...@apache.org]

Author: deepal
Date: Sat Mar 11 06:07:48 2006
New Revision: 385087

URL: http://svn.apache.org/viewcvs?rev=385087&view=rev
Log:
- fixing incorrect handler addition in Phase

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java?rev=385087&r1=385086&r2=385087&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/engine/Phase.java Sat Mar 11 06:07:48 2006
@@ -111,7 +111,12 @@
         log.debug("Handler " + handler.getName() + " added to Phase " + phaseName);
 
         if (phaselastset) {
-            handlers.add(handlers.size() - 2, handler);    // add before phaseLast
+            //handlers.size() can not be 0 , since when setting phase last it is always > 0
+            if (handlers.size() == 1) {
+                handlers.add(0, handler);
+            } else {
+                handlers.add(handlers.size() - 2, handler);
+            }
         } else {
             handlers.add(handler);
         }
@@ -230,8 +235,6 @@
     private void insertBefore(Handler handler) throws PhaseException {
         String beforename = handler.getHandlerDesc().getRules().getBefore();
 
-
-
         //we keep going foward, till the before handler is found, if we do not find him just add the handler
         //once we found the before handler
 
@@ -253,11 +256,11 @@
             }
         }
 
-        if(beforeHandlerIndex >= 0){
-        		//java arraylist does the shift for us
-        		handlers.add(beforeHandlerIndex,handler);
-        }else{
-        		handlers.add(handler);
+        if (beforeHandlerIndex >= 0) {
+            //java arraylist does the shift for us
+            handlers.add(beforeHandlerIndex, handler);
+        } else {
+            handlers.add(handler);
         }
     }