From 4084d675facb0fbb81e9fc49d5218e89e7822f9c Mon Sep 17 00:00:00 2001
From: Fabio Bolognesi <fabio@atmire.com>
Date: Thu, 20 Sep 2012 10:19:44 -0700
Subject: [PATCH] [DS-1194] Item Level Versioning : Bamboo Test Fixes

---
 .../dspace/identifier/VersionedHandleIdentifierProvider.java | 5 ++++-
 .../dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
index ffcbdcc5e5..4ffa57a0a9 100644
--- a/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
+++ b/dspace-api/src/main/java/org/dspace/identifier/VersionedHandleIdentifierProvider.java
@@ -480,10 +480,13 @@ public class VersionedHandleIdentifierProvider extends IdentifierProvider {
 
         if(handle==null){
             handle = DatabaseManager.create(context, "Handle");
-            handleId = createId(handle.getIntColumn("handle_id"));
         }
 
+        if(handleId==null)
+            handleId = createId(handle.getIntColumn("handle_id"));
+
         modifyHandleRecord(context, dso, handle, handleId);
+
         return handleId;
     }
 
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java
index 38fb395b3f..c6fad70b28 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/storedcomponents/XmlWorkflowItem.java
@@ -63,7 +63,7 @@ public class XmlWorkflowItem implements InProgressSubmission {
      */
 //    private ArrayList<StepRecord> activeSteps;
 
-    XmlWorkflowItem(Context context, TableRow row) throws SQLException, AuthorizeException, IOException {
+    XmlWorkflowItem(Context context, TableRow row) throws SQLException {
         ourContext = context;
         wfRow = row;
  //       activeSteps = new ArrayList<StepRecord>();
@@ -369,7 +369,7 @@ public class XmlWorkflowItem implements InProgressSubmission {
      *
      * @return workflow item corresponding to the item, or null
      */
-    public static XmlWorkflowItem findByItem(Context context, Item item) throws SQLException, AuthorizeException, IOException {
+    public static XmlWorkflowItem findByItem(Context context, Item item) throws SQLException{
         TableRow row = DatabaseManager.findByUnique(context, "cwf_workflowitem", "item_id", item.getID());
 
         XmlWorkflowItem wi = null;