perfsonar development work

Author: rodriguez
Date: 2009-03-12 13:19:30 -0400 (Thu, 12 Mar 2009)
New Revision: 5064

Modified:
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
Log:
The authR implies the authn, so it shouldn't send an authN request after an 
authR request is sent

Modified: 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
===================================================================
--- 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-03-12 17:09:04 UTC (rev 5063)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-03-12 17:19:30 UTC (rev 5064)
@@ -60,17 +60,15 @@
                 AuthNComponent authComponent = 
(AuthNComponent)c.getAuxiliaryComponent("auth");
                 authComponent.requestAuthR(messageType, null);
             }
-        } catch (RuntimeException ex) { }
-        
-        try {
-            String authN = 
c.getMessageHandler(messageType).getOption("authN").getValue();
-            logger.debug("Checking authentication: "+authN);
-            if ("yes".equals(authN)) {
-                AuthNComponent authComponent = 
(AuthNComponent)c.getAuxiliaryComponent("auth");
-                authComponent.requestAuthN(messageType);
+            else {
+                String authN = 
c.getMessageHandler(messageType).getOption("authN").getValue();
+                logger.debug("Checking authentication: "+authN);
+                if ("yes".equals(authN)) {
+                    AuthNComponent authComponent = 
(AuthNComponent)c.getAuxiliaryComponent("auth");
+                    authComponent.requestAuthN(messageType);
+                }
             }
         } catch (RuntimeException ex) { }
-
     }
 
     public void execute(ServiceMessage request, ServiceMessage response)
@@ -91,13 +89,13 @@
             //authentication
             checkAuth(c, messageType);
             //service engine
-            serviceEngineClassName = c.getServiceEngineOption(messageType);  
         
+            serviceEngineClassName = c.getServiceEngineOption(messageType);
             serviceEngine = getServiceEngine(serviceEngineClassName);
             if (serviceEngine == null) throw new NullPointerException(
                     "Cannot Instantiate ServiceEngine class 
["+serviceEngineClassName+"]");
 
         } catch (Exception ex) {
-            
+
             String m = "Cannot find ServiceEngine ["+serviceEngineClassName +
                 "] for message type ["+messageType+"], nested exception 
was:"+
                 ex.toString();
@@ -117,7 +115,7 @@
         for (Message inputMessage: extractMultipleRequests(reqMessage)) {
 
             ServiceMessage reqSM = new ServiceMessage(inputMessage);
-            ServiceMessage resSM = new ServiceMessage();                
+            ServiceMessage resSM = new ServiceMessage();
 
             try {