Fix FindBugs and unused code warnings
authormarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Fri, 14 Jan 2011 16:42:17 +0000 (16:42 +0000)
committermarkt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Fri, 14 Jan 2011 16:42:17 +0000 (16:42 +0000)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1059067 13f79535-47bb-0310-9956-ffa450edef68

java/org/apache/catalina/ha/session/DeltaRequest.java

index 0cfd71a..1cddf2b 100644 (file)
@@ -148,10 +148,6 @@ public class DeltaRequest implements Externalizable {
         actions.addLast(info);
     }
     
-    public void execute(DeltaSession session) {
-        execute(session,true);
-    }
-
     public void execute(DeltaSession session, boolean notifyListeners) {
         if ( !this.sessionId.equals( session.getId() ) )
             throw new java.lang.IllegalArgumentException("Session id mismatch, not executing the delta request");
@@ -248,11 +244,11 @@ public class DeltaRequest implements Externalizable {
                     info = actionPool.removeFirst();
                 } catch ( Exception x )  {
                     log.error("Unable to remove element",x);
-                    info = new AttributeInfo(-1,-1,null,null);
+                    info = new AttributeInfo();
                 }
             }
             else {
-                info = new AttributeInfo(-1,-1,null,null);
+                info = new AttributeInfo();
             }
             info.readExternal(in);
             actions.addLast(info);
@@ -297,6 +293,10 @@ public class DeltaRequest implements Externalizable {
         private int action;
         private int type;
 
+        public AttributeInfo() {
+            this(-1, -1, null, null);
+        }
+
         public AttributeInfo(int type,
                              int action,
                              String name,