Merge pull request #432 from UNC-Libraries/email-deposit-transaction-fix

Ensure that the read transaction in DepositEmailHandler is ended.

Author: bbpennel

Diff for: deposit/src/main/java/edu/unc/lib/deposit/work/DepositEmailHandler.java

@@ -230,23 +230,29 @@ private void sendCompleted(String depositUUID) {
 	}
 
 	private String getMainObjectPidForDeposit(String depositUUID) {
-		PID depositPID = new PID("uuid:" + depositUUID);
-		
-		String uri = depositPID.getURI();
-		this.dataset.begin(ReadWrite.READ);
-		Model model = this.dataset.getNamedModel(uri).begin();
-
-		String depositPid = depositPID.getURI();
-		Bag depositBag = model.getBag(depositPid);
-		
-		List<String> topLevelPids = new ArrayList<String>();
-		DepositGraphUtils.walkChildrenDepthFirst(depositBag, topLevelPids, false);
-		
-		// There is a "main object" if the deposit has exactly one top-level object.
-		if (topLevelPids.size() == 1) {
-			return new PID(topLevelPids.get(0)).toString();
-		} else {
-			return null;
+		try {
+			PID depositPID = new PID("uuid:" + depositUUID);
+			
+			String uri = depositPID.getURI();
+			this.dataset.begin(ReadWrite.READ);
+			Model model = this.dataset.getNamedModel(uri).begin();
+	
+			String depositPid = depositPID.getURI();
+			Bag depositBag = model.getBag(depositPid);
+			
+			List<String> topLevelPids = new ArrayList<String>();
+			DepositGraphUtils.walkChildrenDepthFirst(depositBag, topLevelPids, false);
+			
+			// There is a "main object" if the deposit has exactly one top-level object.
+			if (topLevelPids.size() == 1) {
+				return new PID(topLevelPids.get(0)).toString();
+			} else {
+				return null;
+			}
+		} finally {
+			if (this.dataset.isInTransaction()) {
+				this.dataset.end();
+			}
 		}
 	}