Merge "quoted props"

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
index 6a932c4..3d15b09 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/PropAccess.java
@@ -209,6 +209,11 @@ public class PropAccess implements Access {
                        Object value = es.getValue();
                        if(value instanceof String) {
                                String trim = ((String)value).trim();
+                               // Remove Beginning/End Quotes, which might be there if mixed with Bash Props
+                               int s = 0, e=trim.length()-1;
+                               if(s<e && trim.charAt(s)=='"' && trim.charAt(e)=='"') {
+                                       trim=trim.substring(s+1,e);
+                               }
                                if(trim!=value) { // Yes, I want OBJECT equals
                                        props.setProperty((String)es.getKey(), trim);
                                }