commit bed014510c50f05f145415f36863adb9c31ba9c4
author Kai Zheng <kai.zheng@intel.com> Wed Dec 09 10:14:20 2015 +0800
committer Kai Zheng <kai.zheng@intel.com> Wed Dec 09 10:14:20 2015 +0800
tree 208d2cd35409f10e32d2a31b9dd00f23bc63c6f5
parent 8a81025f21a1c16dcc3a55bd4485e4fe77876316
parent eaa7e75a01300595ed0ef53abfd1f7e8135ea21a

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby

kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1Container.java

diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1Container.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1Container.java
index 1399bc0..a0e27ca 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1Container.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/parse/Asn1Container.java
@@ -54,8 +54,13 @@
     public void dumpWith(Asn1Dumper dumper, int indents) {
         dumper.indent(indents).append(toString()).newLine();
 
+        int i = children.size();
         for (Asn1ParseResult aObj : children) {
-            dumper.dumpParseResult(indents + 4, aObj).newLine();
+            dumper.dumpParseResult(indents + 4, aObj);
+            i--;
+            if (i > 0) {
+                dumper.newLine();
+            }
         }
     }
 

kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java

diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
index 8ce0f69..42a1446 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
@@ -122,7 +122,7 @@
             } else {
                 if (parsingItem.isContextSpecific()) {
                     Asn1Binder.bindWithTagging(parsingItem, fieldValue,
-                        fieldInfos[foundPos].getTaggingOption());
+                            fieldInfos[foundPos].getTaggingOption());
                 } else {
                     Asn1Binder.bind(parsingItem, fieldValue);
                 }
@@ -224,9 +224,11 @@
 
             Asn1Type fdValue = fields[i];
             if (fdValue == null || fdValue instanceof Asn1Simple) {
-                dumper.append((Asn1Simple<?>) fdValue).newLine();
+                dumper.append((Asn1Simple<?>) fdValue);
             } else {
                 dumper.newLine().dumpType(indents + 8, fdValue);
+            }
+            if (i < fieldInfos.length - 1) {
                 dumper.newLine();
             }
         }