You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by no...@apache.org on 2012/11/08 14:08:46 UTC
svn commit: r1407046 - in
/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal:
InternalClassDefinition.java util/ClassUtil.java
Author: noctarius
Date: Thu Nov 8 13:08:45 2012
New Revision: 1407046
URL: http://svn.apache.org/viewvc?rev=1407046&view=rev
Log:
Renamed serialVersionUID field to serialVersion
Modified:
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java
directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java?rev=1407046&r1=1407045&r2=1407046&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/InternalClassDefinition.java Thu Nov 8 13:08:45 2012
@@ -39,7 +39,7 @@ class InternalClassDefinition
private final byte[] checksum;
- private final long serialVersionUID;
+ private final long serialVersion;
private long id;
@@ -51,7 +51,7 @@ class InternalClassDefinition
byte[] classData = ClassUtil.getClassBytes( !type.isArray() ? type : type.getComponentType() );
this.checksum = InternalUtil.getChecksum( propertyDescriptors, logger );
this.id = Crc64Util.checksum( classData );
- this.serialVersionUID = ClassUtil.calculateSerialVersionUID( type );
+ this.serialVersion = ClassUtil.calculateSerialVersionUID( type );
}
InternalClassDefinition( long id, Class<?> type, byte[] checksum, long serialVersionUID )
@@ -60,7 +60,7 @@ class InternalClassDefinition
this.type = type;
this.id = id;
this.checksum = checksum;
- this.serialVersionUID = serialVersionUID;
+ this.serialVersion = serialVersionUID;
}
@Override
@@ -90,7 +90,7 @@ class InternalClassDefinition
@Override
public long getSerialVersionUID()
{
- return serialVersionUID;
+ return serialVersion;
}
@Override
@@ -107,7 +107,7 @@ class InternalClassDefinition
result = prime * result + ( ( canonicalName == null ) ? 0 : canonicalName.hashCode() );
result = prime * result + Arrays.hashCode( checksum );
result = prime * result + (int) ( id ^ ( id >>> 32 ) );
- result = prime * result + (int) ( serialVersionUID ^ ( serialVersionUID >>> 32 ) );
+ result = prime * result + (int) ( serialVersion ^ ( serialVersion >>> 32 ) );
return result;
}
@@ -146,7 +146,7 @@ class InternalClassDefinition
{
return false;
}
- if ( serialVersionUID != other.serialVersionUID )
+ if ( serialVersion != other.serialVersion )
{
return false;
}
@@ -157,6 +157,6 @@ class InternalClassDefinition
public String toString()
{
return "InternalClassDefinition [canonicalName=" + canonicalName + ", type=" + type + ", checksum="
- + Arrays.toString( checksum ) + ", serialVersionUID=" + serialVersionUID + ", id=" + id + "]";
+ + Arrays.toString( checksum ) + ", serialVersionUID=" + serialVersion + ", id=" + id + "]";
}
}
Modified: directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java?rev=1407046&r1=1407045&r2=1407046&view=diff
==============================================================================
--- directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java (original)
+++ directmemory/lightning/trunk/lightning-core/src/main/java/org/apache/directmemory/lightning/internal/util/ClassUtil.java Thu Nov 8 13:08:45 2012
@@ -147,24 +147,24 @@ public final class ClassUtil
public static long calculateSerialVersionUID( Class<?> clazz )
{
- Long serialVersionUID = SERIAL_VERSION_UID_CACHE.get( clazz );
- if ( serialVersionUID != null )
+ Long serialVersion = SERIAL_VERSION_UID_CACHE.get( clazz );
+ if ( serialVersion != null )
{
- return serialVersionUID;
+ return serialVersion;
}
if ( Serializable.class.isAssignableFrom( clazz ) )
{
- serialVersionUID = ObjectStreamClass.lookup( clazz ).getSerialVersionUID();
- SERIAL_VERSION_UID_CACHE.put( clazz, serialVersionUID );
- return serialVersionUID;
+ serialVersion = ObjectStreamClass.lookup( clazz ).getSerialVersionUID();
+ SERIAL_VERSION_UID_CACHE.put( clazz, serialVersion );
+ return serialVersion;
}
- serialVersionUID = getSerialVersionUIDFromField( clazz );
- if ( serialVersionUID != null )
+ serialVersion = getSerialVersionUIDFromField( clazz );
+ if ( serialVersion != null )
{
- SERIAL_VERSION_UID_CACHE.put( clazz, serialVersionUID );
- return serialVersionUID;
+ SERIAL_VERSION_UID_CACHE.put( clazz, serialVersion );
+ return serialVersion;
}
try