bcel upgrade to 6.4.1

Author: tarzanek

opengrok-indexer/pom.xml

@@ -20,6 +20,7 @@ CDDL HEADER END
 
 Copyright (c) 2010, 2020, Oracle and/or its affiliates. All rights reserved.
 Portions Copyright (c) 2017-2019, Chris Fraire <[email protected]>.
+Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
 
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

opengrok-indexer/src/main/java/org/opengrok/indexer/analysis/executables/JavaClassAnalyzer.java

@@ -20,6 +20,7 @@
 /*
  * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright (c) 2018-2019, Chris Fraire <[email protected]>.
+ * Portions Copyright (c) 2020-2020, Lubos Kosco <[email protected]>.
  */
 package org.opengrok.indexer.analysis.executables;
 
@@ -306,7 +307,7 @@ private void getContent(Writer out, Writer fout, JavaClass c,
                 fout.write(SPACE);
                 out.write(SPACE);
             }
-            fldsig = Utility.signatureToString(fld.getSignature());
+            fldsig = Utility.typeSignatureToString(fld.getSignature(), true);
             out.write(fldsig);
             fout.write(fldsig);
             out.write(SPACE);
@@ -422,7 +423,7 @@ private void printLocal(Writer out, Writer fout, LocalVariable l,
             out.write(TAB);
             fout.write(TAB);
             fout.write(TAB);
-            String sig = Utility.signatureToString(l.getSignature());
+            String sig = Utility.typeSignatureToString(l.getSignature(), true);
             out.write(sig);
             fout.write(sig);
             out.write(SPACE);
@@ -484,7 +485,7 @@ public String constantToString(Constant c, ConstantPool cp, int[] v)
                     str = Utility.methodSignatureToString(sig,
                             constantToString(cp.getConstant(i), cp, v), " ");
                 } else {
-                    str = Utility.signatureToString(sig) + ' ' +
+                    str = Utility.typeSignatureToString(sig, true) + ' ' +
                             constantToString(cp.getConstant(i), cp, v);
                 }
                 //str = constantToString(cp.getConstant(i)) +' ' + sig;

pom.xml

@@ -91,7 +91,7 @@ Portions Copyright (c) 2018, 2020, Chris Fraire <[email protected]>.
             <dependency>
                 <groupId>org.apache.bcel</groupId>
                 <artifactId>bcel</artifactId>
-                <version>6.2</version>
+                <version>6.4.1</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.lucene</groupId>