From 272aa39d8566d019c87279221cb1ee3f59901d67 Mon Sep 17 00:00:00 2001
From: "Daniel.Huffman" <Daniel.Huffman@noaa.gov>
Date: Wed, 17 Dec 2014 06:20:52 +0000
Subject: [PATCH] ASM #14638 trigger compare fixed.

Change-Id: I5dc06e8a509a9eeb2afa0c41b84a64b502f5e012

Former-commit-id: a91ea93823b8f34ae07d5cb14a1217afa420529f [formerly 9484ea870e166575bf7091c5569a072197f43846 [formerly ba6ed158aa84958ad791f2b83e5f95b0cb302f20]]
Former-commit-id: 9484ea870e166575bf7091c5569a072197f43846
Former-commit-id: f520ff9d712f94ed6626b55a6a164b66c5c3815f
---
 .../subscription/util/TriggerMatcher.java     | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
index 8e38d49829..34f779f4ea 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/subscription/util/TriggerMatcher.java
@@ -35,6 +35,7 @@ import com.raytheon.uf.common.dataplugin.text.db.SubscriptionRecord;
  * Date         Ticket#    Engineer    Description
  * ------------ ---------- ----------- --------------------------
  * May 22, 2014 2536       bclement     Initial creation
+ * 12.13.14     DR 14638   dhuffman     Cut whitespace.
  * 
  * </pre>
  * 
@@ -81,16 +82,20 @@ public class TriggerMatcher {
             // 3)+"NNNXXX" +
             // " -- trigger.substring(0, 3)+\"NNN\"+trigger.substring(6)="+trigger.substring(0,
             // 3)+"NNN"+trigger.substring(6));
-            retVal = (trigger.equalsIgnoreCase(recordTrigger))
-                    || ((trigger.substring(0, 6) + "XXX")
-                            .equalsIgnoreCase(recordTrigger))
-                    || (("CCC" + trigger.substring(3, 6) + "XXX")
-                            .equalsIgnoreCase(recordTrigger))
-                    || ((trigger.substring(0, 3) + "NNNXXX")
-                            .equalsIgnoreCase(recordTrigger))
-                    || ((trigger.substring(0, 3) + "NNN" + trigger.substring(6))
-                            .equalsIgnoreCase(recordTrigger) || (recordTrigger
-                            .startsWith(trigger)));
+            
+            // Below, "subscriptionTrigger" is data from the subscription database table.
+            String subscriptionTrigger = recordTrigger.replaceAll("\\s+$", "");
+            String requestTrigger = trigger.replaceAll("\\s+$", "");
+            retVal = (requestTrigger.equalsIgnoreCase(subscriptionTrigger))
+                    || ((requestTrigger.substring(0, 6) + "XXX")
+                            .equalsIgnoreCase(subscriptionTrigger))
+                    || (("CCC" + requestTrigger.substring(3, 6) + "XXX")
+                            .equalsIgnoreCase(subscriptionTrigger))
+                    || ((requestTrigger.substring(0, 3) + "NNNXXX")
+                            .equalsIgnoreCase(subscriptionTrigger))
+                    || ((requestTrigger.substring(0, 3) + "NNN" + requestTrigger.substring(6))
+                            .equalsIgnoreCase(subscriptionTrigger) || (subscriptionTrigger
+                            .startsWith(requestTrigger)));
         } else {
             String pattern = recordTrigger.replaceAll("\\*", ".+");
             retVal = trigger.matches(pattern);