directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1054600 - in /directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2: editor/ServerConfigurationEditor.java jobs/LoadConfigurationRunnable.java
Date Mon, 03 Jan 2011 12:55:57 GMT
Author: pamarcelot
Date: Mon Jan  3 12:55:56 2011
New Revision: 1054600

URL: http://svn.apache.org/viewvc?rev=1054600&view=rev
Log:
Better handling of errors occurring in other runnables.

Modified:
    directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java
    directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java?rev=1054600&r1=1054599&r2=1054600&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ServerConfigurationEditor.java
Mon Jan  3 12:55:56 2011
@@ -271,7 +271,7 @@ public class ServerConfigurationEditor e
         // Checking if there were errors during the execution of the LDIF
         if ( studioProgressMonitor.errorsReported() )
         {
-            
+            // TODO handle error
         }
         else
         {

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java?rev=1054600&r1=1054599&r2=1054600&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/LoadConfigurationRunnable.java
Mon Jan  3 12:55:56 2011
@@ -289,6 +289,14 @@ public class LoadConfigurationRunnable i
             Entry configEntry = null;
             StudioNamingEnumeration enumeration = SearchRunnable.search( browserConnection,
configSearchParameter,
                 monitor );
+
+            // Checking if an error occurred
+            if ( monitor.errorsReported() )
+            {
+                return null;
+            }
+
+            // Getting the entry
             if ( enumeration.hasMore() )
             {
                 // Creating the 'ou=config' base entry
@@ -338,6 +346,13 @@ public class LoadConfigurationRunnable i
                 // Looking for the children of the entry
                 StudioNamingEnumeration childrenEnumeration = SearchRunnable.search( browserConnection,
                     searchParameter, monitor );
+
+                // Checking if an error occurred
+                if ( monitor.errorsReported() )
+                {
+                    return null;
+                }
+
                 while ( childrenEnumeration.hasMore() )
                 {
                     // Creating the child entry



Mime
View raw message