[qpid-java] 02/02: Rename of BCEL constant classes org.apache.bcel.Constants has been depredated in favour of org.apache.bcel.Const

[Christopher Stuart Hoskin]

This is an automated email from the git hooks/post-receive script.

mans0954 pushed a commit to branch patch-queue/master
in repository qpid-java.

commit 182859cf34fb9ee37a566b368e0efcc79bb69b79
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Sat Sep 30 00:20:35 2017 +0100

    Rename of BCEL constant classes org.apache.bcel.Constants has been depredated in favour of org.apache.bcel.Const
    
    
    Gbp-Pq: Name bcel.patch
---
 .../manager/ldap/LDAPSSLSocketFactoryGenerator.java  | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
index 6aa900c..09383bd 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/ldap/LDAPSSLSocketFactoryGenerator.java
@@ -20,10 +20,10 @@
  */
 package org.apache.qpid.server.security.auth.manager.ldap;
 
-import static org.apache.bcel.Constants.ACC_PRIVATE;
-import static org.apache.bcel.Constants.ACC_PUBLIC;
-import static org.apache.bcel.Constants.ACC_STATIC;
-import static org.apache.bcel.Constants.ACC_SUPER;
+import static org.apache.bcel.Const.ACC_PRIVATE;
+import static org.apache.bcel.Const.ACC_PUBLIC;
+import static org.apache.bcel.Const.ACC_STATIC;
+import static org.apache.bcel.Const.ACC_SUPER;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -32,12 +32,12 @@ import java.lang.reflect.Field;
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLSocketFactory;
 
-import org.apache.bcel.Constants;
+import org.apache.bcel.Const;
 import org.apache.bcel.classfile.JavaClass;
 import org.apache.bcel.generic.ClassGen;
 import org.apache.bcel.generic.ConstantPoolGen;
 import org.apache.bcel.generic.FieldGen;
-import org.apache.bcel.generic.InstructionConstants;
+import org.apache.bcel.generic.InstructionConst;
 import org.apache.bcel.generic.InstructionFactory;
 import org.apache.bcel.generic.InstructionList;
 import org.apache.bcel.generic.MethodGen;
@@ -107,7 +107,7 @@ public class LDAPSSLSocketFactoryGenerator
         createSslContextStaticField(classGen, constantPoolGen);
         createGetDefaultStaticMethod(classGen, constantPoolGen, factory);
 
-        classGen.addEmptyConstructor(Constants.ACC_PROTECTED);
+        classGen.addEmptyConstructor(Const.ACC_PROTECTED);
 
         JavaClass javaClass = classGen.getJavaClass();
         ByteArrayOutputStream out = null;
@@ -167,13 +167,13 @@ public class LDAPSSLSocketFactoryGenerator
                             constantPoolGen);
 
         il.append(instructionFactory.createNew(classGen.getClassName()));
-        il.append(InstructionConstants.DUP);
+        il.append(InstructionConst.DUP);
 
         il.append(instructionFactory.createInvoke(classGen.getClassName(), "<init>", Type.VOID,
                                        new Type[] {},
-                                       Constants.INVOKESPECIAL));
+                                       Const.INVOKESPECIAL));
 
-        il.append(InstructionConstants.ARETURN);
+        il.append(InstructionConst.ARETURN);
 
         mg.setMaxStack();
         classGen.addMethod(mg.getMethod());

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/qpid-java.git