Author: azeez
Date: Tue May 29 00:58:24 2007
New Revision: 542451

URL: http://svn.apache.org/viewvc?view=rev&rev=542451
Log:
Throw an exception if ContextManager is NULL

Modified:
    
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java

Modified: 
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java
URL: 
http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java?view=diff&rev=542451&r1=542450&r2=542451
==============================================================================
--- 
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java
 (original)
+++ 
webservices/axis2/trunk/java/modules/clustering/src/org/apache/axis2/clustering/handlers/ReplicationHandler.java
 Tue May 29 00:58:24 2007
@@ -61,8 +61,7 @@
             if (contextManager == null) {
                 String msg = "Cannot replicate contexts since " +
                              "ContextManager is not specified in the axis2.xml 
file.";
-                log.error(msg);
-                return;
+                throw new ClusteringFault(msg);
             }
 
             // Replicate state stored in ConfigurationContext
@@ -71,19 +70,15 @@
             }
 
             // Replicate state stored in ServiceGroupContext
-            ServiceGroupContext serviceGroupContext = 
message.getServiceGroupContext();
-            if (serviceGroupContext != null) {
-                if (!serviceGroupContext.getPropertyDifferences().isEmpty()) {
-                    contextManager.updateContext(serviceGroupContext);
-                }
+            ServiceGroupContext sgContext = message.getServiceGroupContext();
+            if (sgContext != null && 
!sgContext.getPropertyDifferences().isEmpty()) {
+                contextManager.updateContext(sgContext);
             }
 
             // Replicate state stored in ServiceContext
             ServiceContext serviceContext = message.getServiceContext();
-            if (serviceContext != null) {
-                if (!serviceContext.getPropertyDifferences().isEmpty()) {
-                    contextManager.updateContext(serviceContext);
-                }
+            if (serviceContext != null && 
!serviceContext.getPropertyDifferences().isEmpty()) {
+                contextManager.updateContext(serviceContext);
             }
         } else {
             String msg = "Cannot replicate contexts since " +



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to