Merge pull request #71 from occamlabs/broken-workspaceroot-console-fix

Fixed ugly null pointer when starting up with broken workspace root
deegree · Mar 19, 2013 · fd454b1 · fd454b1
2 parents efc86c2 + 71a3f6e
commit fd454b1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/ConfigManager.java b/deegree-client/deegree-jsf-console/src/main/java/org/deegree/console/ConfigManager.java
@@ -159,9 +159,12 @@ public List<ResourceManagerMetadata2> getProcessManagers() {
     public List<ResourceManagerMetadata2> getConnectionManagers() {
         return getResourceManagers( "connection" );
     }
-    
+
     public List<ResourceManagerMetadata2> getResourceManagers( String category ) {
         List<ResourceManagerMetadata2> rmMetadata = new ArrayList<ResourceManagerMetadata2>();
+        if ( getServiceWorkspace() == null ) {
+            return rmMetadata;
+        }
         for ( ResourceManager mgr : getServiceWorkspace().getResourceManagers() ) {
             ResourceManagerMetadata2 md = ResourceManagerMetadata2.getMetadata( mgr );
             if ( md != null && category.equals( md.getCategory() ) ) {