Ver código fonte

ZOOKEEPER-403. cleanup javac compiler warnings.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/zookeeper/trunk@776807 13f79535-47bb-0310-9956-ffa450edef68
Benjamin Reed 16 anos atrás
pai
commit
8bd356fe1d

+ 2 - 0
CHANGES.txt

@@ -77,6 +77,8 @@ BUGFIXES:
   ZOOKEEPER-405. nullpointer exception in zookeeper java shell. (mahadev via breed)
   ZOOKEEPER-405. nullpointer exception in zookeeper java shell. (mahadev via breed)
 
 
   ZOOKEEPER-410. address all findbugs warnings in client/server classes. (phunt via breed)
   ZOOKEEPER-410. address all findbugs warnings in client/server classes. (phunt via breed)
+  
+  ZOOKEEPER-403. cleanup javac compiler warnings. (flavio via breed)
 
 
 IMPROVEMENTS:
 IMPROVEMENTS:
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.
   ZOOKEEPER-308. improve the atomic broadcast performance 3x.

+ 2 - 0
build.xml

@@ -260,6 +260,8 @@
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" 
         <javac srcdir="${java.src.dir}" destdir="${build.classes}" 
                target="${target.jdk}" debug="on">
                target="${target.jdk}" debug="on">
             <classpath refid="project.classpath"/>
             <classpath refid="project.classpath"/>
+            <compilerarg value="-Xlint:all"/>
+            <compilerarg value="-Xlint:-path"/>
         </javac>
         </javac>
         <copy todir="${build.classes}">
         <copy todir="${build.classes}">
             <fileset dir="${java.src.dir}"/>
             <fileset dir="${java.src.dir}"/>

+ 4 - 5
src/java/main/org/apache/zookeeper/server/quorum/FastLeaderElection.java

@@ -636,7 +636,7 @@ public class FastLeaderElection implements Election {
                             }
                             }
                         }
                         }
                         break;
                         break;
-                    case LEADING:
+                    default:
                         /*
                         /*
                          * There is at most one leader for each epoch, so if a
                          * There is at most one leader for each epoch, so if a
                          * peer claims to be the leader for an epoch, then that
                          * peer claims to be the leader for an epoch, then that
@@ -645,14 +645,15 @@ public class FastLeaderElection implements Election {
                          * this leader, then processes will naturally move
                          * this leader, then processes will naturally move
                          * to a new epoch.
                          * to a new epoch.
                          */
                          */
-                        if(n.epoch == logicalclock){
+                        if((n.state == ServerState.LEADING) && 
+                                (n.epoch == logicalclock)){
                             self.setPeerState((n.leader == self.getId()) ? 
                             self.setPeerState((n.leader == self.getId()) ? 
                                     ServerState.LEADING: ServerState.FOLLOWING);
                                     ServerState.LEADING: ServerState.FOLLOWING);
                        
                        
                             leaveInstance();
                             leaveInstance();
                             return new Vote(n.leader, n.zxid);
                             return new Vote(n.leader, n.zxid);
                         }
                         }
-                    case FOLLOWING:
+                    
                         LOG.info("Notification: " + n.leader + ", " + n.zxid + 
                         LOG.info("Notification: " + n.leader + ", " + n.zxid + 
                                 ", " + n.epoch + ", " + self.getId() + ", " + 
                                 ", " + n.epoch + ", " + self.getId() + ", " + 
                                 self.getPeerState() + ", " + n.state + ", "
                                 self.getPeerState() + ", " + n.state + ", "
@@ -673,8 +674,6 @@ public class FastLeaderElection implements Election {
                             return new Vote(n.leader, n.zxid);
                             return new Vote(n.leader, n.zxid);
                         }
                         }
                         break;
                         break;
-                    default:
-                        break;
                     }
                     }
                 }
                 }
             }
             }

+ 2 - 0
src/java/main/org/apache/zookeeper/server/quorum/FollowerRequestProcessor.java

@@ -74,6 +74,8 @@ public class FollowerRequestProcessor extends Thread implements
                 switch (request.type) {
                 switch (request.type) {
                 case OpCode.sync:
                 case OpCode.sync:
                     zks.pendingSyncs.add(request);
                     zks.pendingSyncs.add(request);
+                    zks.getFollower().request(request);
+                    break;
                 case OpCode.create:
                 case OpCode.create:
                 case OpCode.delete:
                 case OpCode.delete:
                 case OpCode.setData:
                 case OpCode.setData:

+ 1 - 0
src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java

@@ -403,6 +403,7 @@ public class QuorumPeer extends Thread implements QuorumStats.Provider {
         case 3:
         case 3:
             le = new FastLeaderElection(this,
             le = new FastLeaderElection(this,
                         new QuorumCnxManager(this));
                         new QuorumCnxManager(this));
+            break;
         default:
         default:
             assert false;
             assert false;
         }
         }