perfsonar development work

Author: mac
Date: 2009-03-12 11:09:41 -0400 (Thu, 12 Mar 2009)
New Revision: 5061

Modified:
   
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
Log:
Resolving null pointer exception problem (with authentication method that 
failed after previous changes)

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 15:08:30 UTC (rev 5060)
+++ 
branches/new-structure-with-base2/ps-mdm-base2/src/main/java/org/perfsonar/base2/service/messages/GenericMessageHandler.java
        2009-03-12 15:09:41 UTC (rev 5061)
@@ -53,20 +53,24 @@
     }
 
     protected void checkAuth(Configuration c, String messageType) throws 
PerfSONARException {
-       String authR = "no";
-       String authN = "no";
-        authR = 
c.getMessageHandler(messageType).getOption("authR").getValue();
-        authN = 
c.getMessageHandler(messageType).getOption("authN").getValue();
-       logger.debug("Checking authorization: "+authR);
-       logger.debug("Checking authentication: "+authN);
-       if ("yes".equals(authR)) {
-               AuthNComponent authComponent = 
(AuthNComponent)c.getAuxiliaryComponent("auth");
-               authComponent.requestAuthR(messageType, null);
-       }
-       else if ("yes".equals(authN)) {
-               AuthNComponent authComponent = 
(AuthNComponent)c.getAuxiliaryComponent("auth");
-               authComponent.requestAuthN(messageType);
-       }
+        try {
+            String authR = 
c.getMessageHandler(messageType).getOption("authR").getValue();
+            logger.debug("Checking authorization: "+authR);
+            if ("yes".equals(authR)) {
+                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);
+            }
+        } catch (RuntimeException ex) { }
+
     }
 
     public void execute(ServiceMessage request, ServiceMessage response)
@@ -75,23 +79,25 @@
         Message reqMessage = (Message) request.getElement();
 
         logger.debug("Message Handler started for message type 
["+reqMessage.getType()+"]");
+        
//logger.debug("--------------------\n"+reqMessage+"\n------------------------\n");
 
         //get Service engine for this message
         String messageType = null;
         String serviceEngineClassName = null;
         ServiceEngine serviceEngine = null;
         try {
-
             messageType = reqMessage.getType();
             Configuration c = 
ConfigurationManager.getInstance().getConfiguration();
+            //authentication
             checkAuth(c, messageType);
-            serviceEngineClassName = c.getServiceEngineOption(messageType);
+            //service engine
+            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();