Index: modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java =================================================================== --- modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java (revision 409349) +++ modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TimestampTest.java (working copy) @@ -594,5 +594,10 @@ } // end try } // end method testcompareToObject - + + public void test_EqualsObject() { + // regression for HarmonyNNN + Timestamp f = new Timestamp(0L); + assertFalse(f.equals(null)); + } } // end class TimestampTest Index: C:/users/TCKTeam/ws/trunk/modules/sql/src/main/java/java/sql/Timestamp.java =================================================================== --- modules/sql/src/main/java/java/sql/Timestamp.java (revision 409349) +++ modules/sql/src/main/java/java/sql/Timestamp.java (working copy) @@ -158,6 +158,9 @@ */ public boolean equals( Object theObject ) { Timestamp theTimestamp; + if ( theObject == null ) { + return false; + } try { theTimestamp = (Timestamp) theObject; } catch (ClassCastException e) { @@ -172,6 +175,9 @@ * @return true if this Timestamp object is equal to the supplied Timestamp object */ public boolean equals( Timestamp theTimestamp ) { + if ( theTimestamp == null ) { + return false; + } if( (this.getTime() == theTimestamp.getTime()) && (this.getNanos() == theTimestamp.getNanos()) ) { return true; } else {