Correct redirect end of session during check-out operation

[tools/siman.git] / Workspace / Siman / src / org / splat / simer / DisplayStudyStepAction.java

diff --git a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
index 96781cf09585acf7b76c7ba128a9aa963d649f10..8aa9106f3c7a6861e9e1f98625394cf0e9b691cf 100644 (file)
--- a/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
+++ b/Workspace/Siman/src/org/splat/simer/DisplayStudyStepAction.java
@@ -49,11 +49,16 @@ public class DisplayStudyStepAction extends AbstractDisplayAction {
                if (_myindex == null) {
                        if (_selection == null) { // Opening a study just newed
                                _selection = _openStudy.getSelection(); // Default selection
-                       } 
-                       // Re-opening (refreshing) the currently open study
-                       _openStudy = open(getStudyService().selectStudy(
-                                       _openStudy.getIndex())); // Closes the previously open study
-                       _openStudy.setSelection(_selection);
+                       }
+                       if(_openStudy.getStudyObject() == null) {
+                               // Nothing to open or re-open
+                               res = ERROR;
+                       } else {
+                               // Re-opening (refreshing) the currently open study
+                               _openStudy = open(getStudyService().selectStudy(
+                                               _openStudy.getIndex())); // Closes the previously open study
+                               _openStudy.setSelection(_selection);
+                       }
                } else {
                        try { // Opening a study from the search result
                                int index = Integer.valueOf(_myindex);