From 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 3 Oct 2014 17:30:41 +0200
Subject: Huge exception overhaul: Merged ClusterStorageException with
 PersistencyException. Replaced MembershipException with
 InvalidCollectionModification CORBA Exception. Made all predef steps throw
 more accurate exceptions when they go wrong, and let more exceptions bubble
 through from underneath.

---
 src/main/java/com/c2kernel/process/Bootstrap.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/main/java/com/c2kernel/process/Bootstrap.java')

diff --git a/src/main/java/com/c2kernel/process/Bootstrap.java b/src/main/java/com/c2kernel/process/Bootstrap.java
index 6f70867..eebdc47 100644
--- a/src/main/java/com/c2kernel/process/Bootstrap.java
+++ b/src/main/java/com/c2kernel/process/Bootstrap.java
@@ -30,8 +30,8 @@ import java.util.UUID;
 import org.custommonkey.xmlunit.Diff;
 import org.custommonkey.xmlunit.XMLUnit;
 
-import com.c2kernel.common.InvalidDataException;
-import com.c2kernel.common.ObjectNotFoundException;
+import com.c2kernel.common.InvalidData;
+import com.c2kernel.common.ObjectNotFound;
 import com.c2kernel.entity.proxy.AgentProxy;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.events.Event;
@@ -176,7 +176,7 @@ public class Bootstrap
 	                	Logger.error("Bootstrap.verifyResource() - Module clash! Resource '"+itemName+"' included in module "+moduleName+" but is assigned to '"+itemModule+"'. Not overwriting.");
 	                	return path;
 	                }
-	            } catch (ObjectNotFoundException ex) { 
+	            } catch (ObjectNotFound ex) { 
 	            	itemModule = "";
 	            }
 	            
@@ -214,7 +214,7 @@ public class Bootstrap
                     	}
                     }
                     
-                } catch (ObjectNotFoundException ex) {
+                } catch (ObjectNotFound ex) {
                     Logger.msg("Bootstrap.verifyResource() - Item "+itemName+" exists but version "+version+" not found! Attempting to insert new.");
                 }
             
@@ -225,7 +225,7 @@ public class Bootstrap
             		String error = validator.validate(newOutcome.getData());
             		if (error.length() > 0) {
             			Logger.error("Outcome not valid: \n " + error);
-            			throw new InvalidDataException(error, "");
+            			throw new InvalidData(error);
             		}
             	}
                 
@@ -287,7 +287,7 @@ public class Bootstrap
         if (ns!=null && Gateway.getProperties().getBoolean("Module.debug", false))
         	try {
         		ca = (CompositeActivity) ((CompositeActivityDef)LocalObjectLoader.getActDef(impHandler.getWorkflowName(), 0)).instantiate();
-        	} catch (ObjectNotFoundException ex) {
+        	} catch (ObjectNotFound ex) {
         		Logger.error("Module resource workflow "+impHandler.getWorkflowName()+" not found. Using empty.");
         	}
 
@@ -313,7 +313,7 @@ public class Bootstrap
              systemAgents.put(name, Gateway.getProxyManager().getAgentProxy(lookup.getAgentPath(name)));
              Logger.msg(3, "Bootstrap.checkAgent() - User '"+name+"' found.");
              return;
-         } catch (ObjectNotFoundException ex) { }
+         } catch (ObjectNotFound ex) { }
          
          Logger.msg("Bootstrap.checkAgent() - User '"+name+"' not found. Creating.");
 
@@ -365,7 +365,7 @@ public class Bootstrap
         ItemPath serverEntity;
         try {
             serverEntity = thisServerPath.getItemPath();
-        } catch (ObjectNotFoundException ex) {
+        } catch (ObjectNotFound ex) {
             Logger.msg("Creating server item "+thisServerPath);
             serverEntity = new ItemPath();
             Gateway.getCorbaServer().createItem(serverEntity);
-- 
cgit v1.2.3