You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@karaf.apache.org by io...@apache.org on 2011/05/07 20:32:50 UTC

svn commit: r1100585 - /karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java

Author: iocanel
Date: Sat May  7 18:32:49 2011
New Revision: 1100585

URL: http://svn.apache.org/viewvc?rev=1100585&view=rev
Log:
Merged KARAF-622 to Karaf 2.2.x

Modified:
    karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java

Modified: karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java?rev=1100585&r1=1100584&r2=1100585&view=diff
==============================================================================
--- karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java (original)
+++ karaf/branches/karaf-2.2.x/jaas/command/src/main/java/org/apache/karaf/jaas/command/CancelCommand.java Sat May  7 18:32:49 2011
@@ -28,11 +28,16 @@ import java.util.LinkedList;
 public class CancelCommand extends JaasCommandSupport {
 
     @Override
-    protected Object doExecute(BackingEngine engine) throws Exception {
+    protected Object doExecute() throws Exception {
         //Cleanup the session
         session.put(JAAS_REALM, null);
         session.put(JAAS_ENTRY, null);
         session.put(JAAS_CMDS, new LinkedList<JaasCommandSupport>());
         return null;
     }
+
+    @Override
+    protected Object doExecute(BackingEngine engine) throws Exception {
+        return null;
+    }
 }