svn commit: r981511 - in /camel/trunk/components/camel-shiro: ./ src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityToken.java

[davsclaus]

Author: davsclaus
Date: Mon Aug  2 13:57:04 2010
New Revision: 981511

URL: http://svn.apache.org/viewvc?rev=981511&view=rev
Log:
Polished.

Modified:
    camel/trunk/components/camel-shiro/   (props changed)
    
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
    
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityToken.java

Propchange: camel/trunk/components/camel-shiro/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Aug  2 13:57:04 2010
@@ -0,0 +1,9 @@
+.project
+.checkstyle
+.pmd
+.classpath
+target
+.settings
+eclipse-classes
+*.i??
+classes

Modified: 
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java?rev=981511&r1=981510&r2=981511&view=diff
==============================================================================
--- 
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
 (original)
+++ 
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityPolicy.java
 Mon Aug  2 13:57:04 2010
@@ -30,6 +30,7 @@ import org.apache.camel.impl.converter.A
 import org.apache.camel.model.ProcessorDefinition;
 import org.apache.camel.spi.AuthorizationPolicy;
 import org.apache.camel.spi.RouteContext;
+import org.apache.camel.util.AsyncProcessorHelper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.shiro.SecurityUtils;
@@ -120,17 +121,20 @@ public class ShiroSecurityPolicy impleme
     public Processor wrap(RouteContext routeContext, final Processor 
processor) {        
         return new AsyncProcessor() {
             public boolean process(Exchange exchange, final AsyncCallback 
callback)  {
-                boolean sync = false;
+                boolean sync;
                 try {
                     applySecurityPolicy(exchange);
                 } catch (Exception e) {
+                    // exception occurred so break out
                     exchange.setException(e);
+                    callback.done(true);
+                    return true;
                 }
                 
                 // If here, then user is authenticated and authorized
-                // Now let the original processor continue routing
+                // Now let the original processor continue routing supporting 
the async routing engine
                 AsyncProcessor ap = 
AsyncProcessorTypeConverter.convert(processor);
-                sync = ap.process(exchange, new AsyncCallback() {
+                sync = AsyncProcessorHelper.process(ap, exchange, new 
AsyncCallback() {
                     public void done(boolean doneSync) {
                         // we only have to handle async completion of this 
policy
                         if (doneSync) {

Modified: 
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityToken.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityToken.java?rev=981511&r1=981510&r2=981511&view=diff
==============================================================================
--- 
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityToken.java
 (original)
+++ 
camel/trunk/components/camel-shiro/src/main/java/org/apache/camel/component/shiro/security/ShiroSecurityToken.java
 Mon Aug  2 13:57:04 2010
@@ -44,5 +44,9 @@ public class ShiroSecurityToken implemen
     public void setPassword(String password) {
         this.password = password;
     }
-    
+
+    @Override
+    public String toString() {
+        return "ShiroSecurityToken[" + username + "]";
+    }
 }