Fix JENKINS-12992

jenkinsci · Mar 6, 2012 · 3f82eb7 · 3f82eb7
1 parent 092bff9
commit 3f82eb7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/lib/xtrigger/AbstractTrigger.java b/src/main/java/org/jenkinsci/lib/xtrigger/AbstractTrigger.java
@@ -299,7 +299,6 @@ private List<Node> getPollingNodeList(XTriggerLog log) {
     }
 
     private List<Node> getPollingNodeListRequiredNoWS(XTriggerLog log) {
-        log.info("Poll doesn't requires a workspace.");
 
         AbstractProject project = (AbstractProject) job;
 
@@ -314,7 +313,6 @@ private List<Node> getPollingNodeListRequiredNoWS(XTriggerLog log) {
     }
 
     private List<Node> getPollingNodeListRequiredWS(XTriggerLog log) {
-        log.info("Poll requires a workspace.");
 
         AbstractProject project = (AbstractProject) job;
 

diff --git a/src/main/java/org/jenkinsci/lib/xtrigger/AbstractTriggerByFullContext.java b/src/main/java/org/jenkinsci/lib/xtrigger/AbstractTriggerByFullContext.java
@@ -28,9 +28,13 @@ public AbstractTriggerByFullContext(String cronTabSpec) throws ANTLRException {
      */
     @Override
     protected void start(Node pollingNode, BuildableItem project, boolean newInstance, XTriggerLog log) throws XTriggerException {
-        context = getContext(pollingNode, log);
+        if (isContextOnStartupFetched()) {
+            context = getContext(pollingNode, log);
+        }
     }
 
+    public abstract boolean isContextOnStartupFetched();
+
     @Override
     protected boolean checkIfModified(Node pollingNode, XTriggerLog log) throws XTriggerException {
 
@@ -44,6 +48,12 @@ protected boolean checkIfModified(Node pollingNode, XTriggerLog log) throws XTri
             return false;
         }
 
+        if (context == null) {
+            log.info("Recording context. Check changes in next poll.");
+            setNewContext(newContext);
+            return false;
+        }
+
         boolean changed = checkIfModified(context, newContext, log);
         setNewContext(newContext);
         return changed;