summaryrefslogtreecommitdiffstats
path: root/misc
diff options
context:
space:
mode:
authorJonathan Gathman <jonathan.gathman@att.com>2019-07-03 14:10:55 +0000
committerGerrit Code Review <gerrit@onap.org>2019-07-03 14:10:55 +0000
commit82093b06399d9a57cd7e486e9fbeeea9d026cc7c (patch)
tree444e7211fcf6f4169c4d338ddbf4c10570ce49b3 /misc
parent9f1388eb5ac3f9aab5fe617eae55b08fd2a57059 (diff)
parentf639b3f691693c2ec2837e42669b432289393838 (diff)
Merge "Commented out dead/unreachable code (maybe some error in control logic?)"
Diffstat (limited to 'misc')
-rw-r--r--misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java
index 6c868378..2d93bb49 100644
--- a/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java
+++ b/misc/rosetta/src/main/java/org/onap/aaf/misc/rosetta/OutJson.java
@@ -39,13 +39,13 @@ public class OutJson extends Out {
} else {
ipw = null;
}
-
+
// If it's a fragment, print first Object Name. If root Object, skip first name
Stack<LevelStack> jsonLevel = new Stack<LevelStack>();
jsonLevel.push(new LevelStack(options.length>1 && options[1]));
boolean print = true, hadData=false;
char afterName=0, beforeName=0, maybe = 0, prev=0;
-
+
int count = 0;
while ((p = prs.parse(in,p.reuse())).valid()) {
++count;
@@ -112,18 +112,20 @@ public class OutJson extends Out {
default:
print = true;
}
-
+
if (maybe!=0) {
if (ipw==null)writer.append(maybe);
else ipw.println(maybe);
maybe = 0;
}
-
- if (beforeName!=0) {
- if (ipw==null)writer.append(beforeName);
- else ipw.println(beforeName);
- beforeName = 0;
- }
+
+ // commented out unreachable code (as it is, beforeName is never
+ // assigned any value except 0
+ //if (beforeName!=0) {
+ // if (ipw==null)writer.append(beforeName);
+ // else ipw.println(beforeName);
+ // beforeName = 0;
+ //}
if (print) {
if (p.hasName()) {
writer.append('"');