[JENKINS-4099] Deleting branch causes build failure in clearcase plugin

jenkinsci · Oct 4, 2013 · 3b07ba1 · 3b07ba1
1 parent 24eaea4
commit 3b07ba1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/clearcase/history/DefaultFilter.java b/src/main/java/hudson/plugins/clearcase/history/DefaultFilter.java
@@ -24,6 +24,8 @@
  */
 package hudson.plugins.clearcase.history;
 
+import org.apache.commons.lang.StringUtils;
+
 /**
  * @author Henrik L. Hansen (henrik.lynggaard@gmail.com)
  */
@@ -38,6 +40,8 @@ public boolean accept(HistoryEntry entry) {
             return false;
         if (entry.getEvent().equalsIgnoreCase("create branch"))
             return false;
+        if (StringUtils.isEmpty(entry.getActivityName()))
+            return false;
 
         return true;
     }

diff --git a/src/main/java/hudson/plugins/clearcase/history/HistoryEntry.java b/src/main/java/hudson/plugins/clearcase/history/HistoryEntry.java
@@ -36,7 +36,7 @@
 public class HistoryEntry {
 
     String        activityHeadline;
-    String        activityName;
+    String        activityName = "undefined_for_non_ucm";
     StringBuilder commentBuilder = new StringBuilder();
     Date          date;
     String        dateText;