You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/10/18 16:27:25 UTC
svn commit: r1399675 - in
/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes:
BaseDatatype.java xsd/XSDbase64Binary.java xsd/XSDhexBinary.java
Author: andy
Date: Thu Oct 18 14:27:25 2012
New Revision: 1399675
URL: http://svn.apache.org/viewvc?rev=1399675&view=rev
Log:
JENA-335 : Make getHashCode check the "wellformed" flag of the LiteralLabel.
Modified:
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDbase64Binary.java
jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDhexBinary.java
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java?rev=1399675&r1=1399674&r2=1399675&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/BaseDatatype.java Thu Oct 18 14:27:25 2012
@@ -152,7 +152,7 @@ public class BaseDatatype implements RDF
protected static boolean isEqualPlain(LiteralLabel litLabel1, LiteralLabel litLabel2) {
return litLabel1.getDatatype() == litLabel2.getDatatype()
&& litLabel1.getValue().equals(litLabel2.getValue());
-}
+ }
/**
Default implementation of getHashCode() delegates to the default from
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDbase64Binary.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDbase64Binary.java?rev=1399675&r1=1399674&r2=1399675&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDbase64Binary.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDbase64Binary.java Thu Oct 18 14:27:25 2012
@@ -78,5 +78,11 @@ public class XSDbase64Binary extends XSD
@Override
public int getHashCode( LiteralLabel lit )
- { return getHashCode( (byte []) lit.getValue() ); }
+ {
+ // Java arrays are not equal by value.
+ if ( lit.isWellFormed() )
+ return getHashCode( (byte []) lit.getValue() );
+ else
+ return lit.getLexicalForm().hashCode() ;
+ }
}
Modified: jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDhexBinary.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDhexBinary.java?rev=1399675&r1=1399674&r2=1399675&view=diff
==============================================================================
--- jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDhexBinary.java (original)
+++ jena/trunk/jena-core/src/main/java/com/hp/hpl/jena/datatypes/xsd/XSDhexBinary.java Thu Oct 18 14:27:25 2012
@@ -78,6 +78,12 @@ public class XSDhexBinary extends XSDDat
@Override
public int getHashCode( LiteralLabel lit )
- { return getHashCode( (byte []) lit.getValue() ); }
-
+ {
+ // Can't use super.getHashCode as that does "value.hashCode"
+ // Java arrays are not equal by value and their has code of the sameValue array are different.
+ if ( lit.isWellFormed() )
+ return getHashCode( (byte []) lit.getValue() );
+ else
+ return lit.getLexicalForm().hashCode() ;
+ }
}