From 2d96ef8bf0c8b786e56efe7951231806d89f5eaa Mon Sep 17 00:00:00 2001
From: Lingchao Xin <lingchaox.xin@intel.com>
Date: Thu, 25 Jul 2013 11:40:52 +0800
Subject: [PATCH] No need to validate interested OBS Events' RegExp ended with
 ';' or not

This patch maybe fix jenkins-1.509.2' complain, and also it is a logic
bug, since we can't do a toJSON operation to a string which ends with
a ';'.

Change-Id: Ibec9bae12ff5f690bc37a29d7ca411dfff4f5db7
Signed-off-by: Lingchao Xin <lingchaox.xin@intel.com>
---
 .../com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger.java     | 2 --
 .../intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger/config.jelly | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger.java b/src/main/java/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger.java
index 8b2bc91..0219783 100644
--- a/src/main/java/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger.java
+++ b/src/main/java/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger.java
@@ -454,8 +454,6 @@ public final class ObsEventTrigger extends Trigger<AbstractProject> implements O
 
         public FormValidation doCheckInterestedEvent(
                     @QueryParameter("value") final String value) {
-            if(!value.endsWith(";"))
-                return FormValidation.error("Please end the String with a ;.");
             try {
                 JSONObject ob = (JSONObject) JSONSerializer.toJSON( value );
                 return FormValidation.ok();
diff --git a/src/main/resources/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger/config.jelly b/src/main/resources/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger/config.jelly
index f87a371..1175d5c 100755
--- a/src/main/resources/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger/config.jelly
+++ b/src/main/resources/com/intel/jenkins/plugins/obsevent/trigger/ObsEventTrigger/config.jelly
@@ -68,7 +68,7 @@
             <div align="center" style="width:80%;float:left;">
                 <f:textbox field="pattern" 
                            value="${i.pattern}"
-                           default="{};"
+                           default="{}"
                            checkUrl="'descriptorByName/com.intel.jenkins.plugins.obsevent.trigger.ObsEventTrigger/checkInterestedEvent?value='+escape(this.value)"/>
             </div>
             <div align="right" style="width:10%;float:right;">
-- 
2.7.4