From 8808496f83d3dbbc22ca96f57d64237beca18df6 Mon Sep 17 00:00:00 2001 From: jmillman Date: Wed, 24 Jun 2015 10:29:03 -0400 Subject: [PATCH] catch IllegalStateException from Case.getCurrentCase() in TagsManager methods --- .../casemodule/services/Bundle.properties | 6 ++++- .../casemodule/services/TagsManager.java | 24 +++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties index 5242f90667..b267fde0a2 100644 --- a/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties +++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/Bundle.properties @@ -14,4 +14,8 @@ FileManager.addLocalDirInt2.exception.closed.msg=Attempted to use FileManager af TagsManager.addContentTag.exception.beginByteOffsetOOR.msg=beginByteOffset \= {0} out of content size range (0 - {1}) TagsManager.addContentTag.exception.endByteOffsetOOR.msg=endByteOffset \= {0} out of content size range (0 - {1}) TagsManager.addContentTag.exception.endLTbegin.msg=endByteOffset < beginByteOffset -TagsManager.predefTagNames.bookmark.text=Bookmark \ No newline at end of file +TagsManager.predefTagNames.bookmark.text=Bookmark +TagsManager.addContentTag.noCaseWarning=Failed to add publish new content tag event. There is no case open. +TagsManager.deleteContentTag.noCaseWarning=Failed to add publish content tag deleted event. There is no case open. +TagsManager.addBlackboardArtifactTag.noCaseWarning=Failed to add publish new blackboard artifact tag event. There is no case open. +TagsManager.deleteBlackboardArtifactTag.noCaseWarning=Failed to add publish blackboard artifact tag deleted event. There is no case open. diff --git a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java index 123238c4e3..01daae9fba 100755 --- a/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java +++ b/Core/src/org/sleuthkit/autopsy/casemodule/services/TagsManager.java @@ -248,7 +248,11 @@ public class TagsManager implements Closeable { } } final ContentTag newContentTag = tskCase.addContentTag(content, tagName, comment, beginByteOffset, endByteOffset); - Case.getCurrentCase().notifyContentTagAdded(newContentTag); + try { + Case.getCurrentCase().notifyContentTagAdded(newContentTag); + } catch (IllegalArgumentException ex) { + Logger.getLogger(TagsManager.class.getName()).log(Level.WARNING, NbBundle.getMessage(TagsManager.class, "TagsManager.addContentTag.noCaseWarning")); + } return newContentTag; } @@ -266,7 +270,11 @@ public class TagsManager implements Closeable { } tskCase.deleteContentTag(tag); - Case.getCurrentCase().notifyContentTagDeleted(tag); + try { + Case.getCurrentCase().notifyContentTagDeleted(tag); + } catch (IllegalArgumentException e) { + Logger.getLogger(TagsManager.class.getName()).log(Level.WARNING, NbBundle.getMessage(TagsManager.class, "TagsManager.deleteContentTag.noCaseWarning")); + } } /** @@ -375,7 +383,11 @@ public class TagsManager implements Closeable { } BlackboardArtifactTag addBlackboardArtifactTag = tskCase.addBlackboardArtifactTag(artifact, tagName, comment); - Case.getCurrentCase().notifyBlackBoardArtifactTagAdded(addBlackboardArtifactTag); + try { + Case.getCurrentCase().notifyBlackBoardArtifactTagAdded(addBlackboardArtifactTag); + } catch (IllegalArgumentException e) { + Logger.getLogger(TagsManager.class.getName()).log(Level.WARNING, NbBundle.getMessage(TagsManager.class, "TagsManager.addBlackboardArtifactTag.noCaseWarning")); + } return addBlackboardArtifactTag; } @@ -393,7 +405,11 @@ public class TagsManager implements Closeable { } tskCase.deleteBlackboardArtifactTag(tag); - Case.getCurrentCase().notifyBlackBoardArtifactTagDeleted(tag); + try { + Case.getCurrentCase().notifyBlackBoardArtifactTagDeleted(tag); + } catch (IllegalArgumentException e) { + Logger.getLogger(TagsManager.class.getName()).log(Level.WARNING, NbBundle.getMessage(TagsManager.class, "TagsManager.deleteBlackboardArtifactTag.noCaseWarning")); + } } /**