accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject svn commit: r1494818 - in /accumulo/branches/1.5/core: ./ src/main/java/org/apache/accumulo/core/client/IteratorSetting.java src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
Date Thu, 20 Jun 2013 00:24:42 GMT
Author: elserj
Date: Thu Jun 20 00:24:41 2013
New Revision: 1494818

URL: http://svn.apache.org/r1494818
Log:
ACCUMULO-1504 Merge Miguel's changes from 1.4 to 1.5

Added:
    accumulo/branches/1.5/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
      - copied unchanged from r1494816, accumulo/branches/1.4/src/core/src/test/java/org/apache/accumulo/core/client/IteratorSettingTest.java
Modified:
    accumulo/branches/1.5/core/   (props changed)
    accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java

Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1494797
  Merged /accumulo/branches/1.4/src/core:r1494816

Modified: accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java?rev=1494818&r1=1494817&r2=1494818&view=diff
==============================================================================
--- accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
(original)
+++ accumulo/branches/1.5/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
Thu Jun 20 00:24:41 2013
@@ -264,6 +264,52 @@ public class IteratorSetting implements 
   }
   
   /**
+   * @see java.lang.Object#hashCode()
+   */
+  @Override
+  public int hashCode() {
+    final int prime = 31;
+    int result = 1;
+    result = prime * result + ((iteratorClass == null) ? 0 : iteratorClass.hashCode());
+    result = prime * result + ((name == null) ? 0 : name.hashCode());
+    result = prime * result + priority;
+    result = prime * result + ((properties == null) ? 0 : properties.hashCode());
+    return result;
+  }
+  
+  /**
+   * @see java.lang.Object#equals()
+   */
+  @Override
+  public boolean equals(Object obj) {
+    if (this == obj)
+      return true;
+    if (obj == null)
+      return false;
+    if (!(obj instanceof IteratorSetting))
+      return false;
+    IteratorSetting other = (IteratorSetting) obj;
+    if (iteratorClass == null) {
+      if (other.iteratorClass != null)
+        return false;
+    } else if (!iteratorClass.equals(other.iteratorClass))
+      return false;
+    if (name == null) {
+      if (other.name != null)
+        return false;
+    } else if (!name.equals(other.name))
+      return false;
+    if (priority != other.priority)
+      return false;
+    if (properties == null) {
+      if (other.properties != null)
+        return false;
+    } else if (!properties.equals(other.properties))
+      return false;
+    return true;
+  }
+
+  /**
    * @see java.lang.Object#toString()
    */
   @Override



Mime
View raw message