Author: sagara Date: Fri Dec 9 11:29:12 2011 New Revision: 1212335 URL: http://svn.apache.org/viewvc?rev=1212335&view=rev Log: Applied patch for AXIS2-4238.
Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Handler.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Phase.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Handler.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Handler.java?rev=1212335&r1=1212334&r2=1212335&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Handler.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Handler.java Fri Dec 9 11:29:12 2011 @@ -33,12 +33,7 @@ import org.apache.axis2.description.Para * their state in Context objects (see the org.apache.axis2.context package). */ public interface Handler { - - /** - * @deprecated This method will be going away after the 1.3 release, it was never used. - */ - public void cleanup(); - + /** * Initialize a Handler. * Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Phase.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Phase.java?rev=1212335&r1=1212334&r2=1212335&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Phase.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/engine/Phase.java Fri Dec 9 11:29:12 2011 @@ -25,7 +25,6 @@ import org.apache.axis2.context.MessageC import org.apache.axis2.description.HandlerDescription; import org.apache.axis2.description.Parameter; import org.apache.axis2.description.PhaseRule; -import org.apache.axis2.handlers.AbstractHandler; import org.apache.axis2.phaseresolver.PhaseException; import org.apache.axis2.util.LoggingControl; import org.apache.commons.logging.Log; @@ -193,10 +192,6 @@ public class Phase implements Handler { // Default version does nothing } - public void cleanup() { - // Default version does nothing - } - public void init(HandlerDescription handlerdesc) { // Default version does nothing } Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java?rev=1212335&r1=1212334&r2=1212335&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/handlers/AbstractHandler.java Fri Dec 9 11:29:12 2011 @@ -20,12 +20,10 @@ package org.apache.axis2.handlers; -import org.apache.axis2.AxisFault; import org.apache.axis2.context.MessageContext; import org.apache.axis2.description.HandlerDescription; import org.apache.axis2.description.Parameter; import org.apache.axis2.engine.Handler; -import org.apache.axis2.engine.Handler.InvocationResponse; /** * Class AbstractHandler @@ -43,15 +41,7 @@ public abstract class AbstractHandler im public AbstractHandler() { handlerDesc = new HandlerDescription("DefaultHandler"); } - - /** - * Since this might change the whole behavior of Axis2 handlers, and since this is still under discussion - * (http://marc.theaimsgroup.com/?l=axis-dev&m=114504084929285&w=2) implementation of this method is deferred. - * Note : This method will not be automatically called, from Axis2 engine, until this is fully implemented. - */ - public void cleanup() { - } - + /** * Method init. *