System dependent separators

[aaf/authz.git] / cadi / core / src / main / java / org / onap / aaf / cadi / Symm.java

diff --git a/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java b/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
index 5a3fe82..07652d2 100644 (file)
--- a/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
+++ b/cadi/core/src/main/java/org/onap/aaf/cadi/Symm.java
@@ -138,7 +138,7 @@ public class Symm {
                // There can be time efficiencies gained when the underlying keyset consists mainly of ordered 
                // data (i.e. abcde...).  Therefore, we'll quickly analyze the keyset.  If it proves to have
                // too much entropy, the "Unordered" algorithm, which is faster in such cases is used.
-               ArrayList<int[]> la = new ArrayList<int[]>();
+               ArrayList<int[]> la = new ArrayList<>();
                for(int i=0;i<codeset.length;++i) {
                        curr = codeset[i];
                        if(prev+1==curr) { // is next character in set
@@ -483,7 +483,8 @@ public class Symm {
                   switch(read) {
                           case -1: 
                           case '=':
-                          case '\n': 
+                                case '\n':
+                                case '\r':
                                   return -1;
                   }
                   for(int i=0;i<codec.length;++i) {