Make 'info' fields in these classes static and final, like in other places in Tomcat.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@952475 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/StandardPipeline.java b/java/org/apache/catalina/core/StandardPipeline.java
index d1af28b..2be3154 100644 (file)
--- a/java/org/apache/catalina/core/StandardPipeline.java
+++ b/java/org/apache/catalina/core/StandardPipeline.java
@@ -100,7 +100,7 @@ public class StandardPipeline extends LifecycleBase
     /**
      * Descriptive information about this implementation.
      */
-    protected String info = "org.apache.catalina.core.StandardPipeline/1.0";
+    protected static final String info = "org.apache.catalina.core.StandardPipeline/1.0";
 
 
     /**
@@ -116,7 +116,7 @@ public class StandardPipeline extends LifecycleBase
      */
     public String getInfo() {
 
-        return (this.info);
+        return info;
 
     }
     

diff --git a/java/org/apache/catalina/realm/MemoryRealm.java b/java/org/apache/catalina/realm/MemoryRealm.java
index 9334f94..dea62c9 100644 (file)
--- a/java/org/apache/catalina/realm/MemoryRealm.java
+++ b/java/org/apache/catalina/realm/MemoryRealm.java
@@ -61,7 +61,7 @@ public class MemoryRealm  extends RealmBase {
     /**
      * Descriptive information about this Realm implementation.
      */
-    protected final String info =
+    protected static final String info =
         "org.apache.catalina.realm.MemoryRealm/1.0";
 
 

diff --git a/java/org/apache/catalina/realm/UserDatabaseRealm.java b/java/org/apache/catalina/realm/UserDatabaseRealm.java
index cf1a32a..b1f49bd 100644 (file)
--- a/java/org/apache/catalina/realm/UserDatabaseRealm.java
+++ b/java/org/apache/catalina/realm/UserDatabaseRealm.java
@@ -64,7 +64,7 @@ public class UserDatabaseRealm
     /**
      * Descriptive information about this Realm implementation.
      */
-    protected final String info =
+    protected static final String info =
         "org.apache.catalina.realm.UserDatabaseRealm/1.0";