diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2014-10-03 23:18:47 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2014-10-03 23:18:47 +0200 |
| commit | b68ea0f2b12c4c5189c5fc7c182a1b242dc63579 (patch) | |
| tree | 85b1cc4713ba978c044bfa0656f9115c9f9bf9e3 /src/main/java/com/c2kernel/utils/StateMachineCache.java | |
| parent | 275d0bbf555c8917be82ce4cc21eb4cabb00f4c5 (diff) | |
Rolled back the renaming of existing exceptions.
Diffstat (limited to 'src/main/java/com/c2kernel/utils/StateMachineCache.java')
| -rw-r--r-- | src/main/java/com/c2kernel/utils/StateMachineCache.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/com/c2kernel/utils/StateMachineCache.java b/src/main/java/com/c2kernel/utils/StateMachineCache.java index 9b9e464..02eb881 100644 --- a/src/main/java/com/c2kernel/utils/StateMachineCache.java +++ b/src/main/java/com/c2kernel/utils/StateMachineCache.java @@ -23,8 +23,8 @@ */
package com.c2kernel.utils;
-import com.c2kernel.common.InvalidData;
-import com.c2kernel.common.ObjectNotFound;
+import com.c2kernel.common.InvalidDataException;
+import com.c2kernel.common.ObjectNotFoundException;
import com.c2kernel.common.PersistencyException;
import com.c2kernel.entity.proxy.ItemProxy;
import com.c2kernel.lifecycle.instance.stateMachine.StateMachine;
@@ -41,7 +41,7 @@ public class StateMachineCache extends DescriptionObjectCache<StateMachine> { }
@Override
- public StateMachine loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFound, InvalidData {
+ public StateMachine loadObject(String name, int version, ItemProxy proxy) throws ObjectNotFoundException, InvalidDataException {
StateMachine thisStateMachine;
Viewpoint smView = (Viewpoint)proxy.getObject(ClusterStorage.VIEWPOINT + "/StateMachine/" + version);
String marshalledSM;
@@ -49,14 +49,14 @@ public class StateMachineCache extends DescriptionObjectCache<StateMachine> { marshalledSM = smView.getOutcome().getData();
} catch (PersistencyException ex) {
Logger.error(ex);
- throw new ObjectNotFound("Problem loading State Machine "+name+" v"+version+": "+ex.getMessage());
+ throw new ObjectNotFoundException("Problem loading State Machine "+name+" v"+version+": "+ex.getMessage());
}
try {
thisStateMachine = (StateMachine)Gateway.getMarshaller().unmarshall(marshalledSM);
thisStateMachine.validate();
} catch (Exception ex) {
Logger.error(ex);
- throw new InvalidData("Could not unmarshall State Machine '"+name+"' v"+version+": "+ex.getMessage());
+ throw new InvalidDataException("Could not unmarshall State Machine '"+name+"' v"+version+": "+ex.getMessage());
}
thisStateMachine.setName(name);
thisStateMachine.setVersion(version);
|
