used long instead of int in CacheKey calculation

SpringcacheGrailsPlugin.groovy

@@ -26,7 +26,7 @@ import org.springframework.cache.ehcache.*
 
 class SpringcacheGrailsPlugin {
 
-	def version = "1.3.2-SNAPSHOT"
+	def version = "1.3.3"
 	def grailsVersion = "1.2.0 > *"
 	def dependsOn = [:]
 	def pluginExcludes = [

application.properties

@@ -1,4 +1,7 @@
 #Grails Metadata file
-#Tue Dec 21 13:35:56 GMT 2010
-app.grails.version=1.3.7
+#Wed Aug 22 11:15:31 CAT 2012
+app.grails.version=2.0.0
 app.name=springcache
+plugins.hibernate=2.0.0
+plugins.svn=1.0.0.M1
+plugins.tomcat=2.0.0

grails-app/conf/BuildConfig.groovy

@@ -25,7 +25,7 @@ grails.project.dependency.resolution = {
 		}
 	}
 	plugins {
-		test(":spock:0.5-groovy-1.7") {
+		test(":spock:0.6") {
 			export = false
 		}
 		build(":release:1.0.0.RC3") {

grails-app/conf/Config.groovy

@@ -13,3 +13,5 @@ grails {
 		alias.cacheConfiguration="7. Cache Configuration"
 	}
 }
+grails.views.default.codec="none" // none, html, base64
+grails.views.gsp.encoding="UTF-8"

src/groovy/grails/plugin/springcache/CacheKey.groovy

@@ -22,7 +22,7 @@ import grails.plugin.springcache.key.CacheKeyBuilder
  */
 final class CacheKey implements Serializable {
 
-	private final int hash
+	private final long hash
 	private final long checksum
 
 	static CacheKey generate(Object[] components) {
@@ -33,7 +33,7 @@ final class CacheKey implements Serializable {
 		builder.toCacheKey()
 	}
 
-	CacheKey(int hashCode, long checksum) {
+	CacheKey(long hashCode, long checksum) {
 		this.hash = hashCode
 		this.checksum = checksum
 	}
@@ -48,7 +48,7 @@ final class CacheKey implements Serializable {
 
 	@Override
 	int hashCode() {
-		int result = hash
+		int result = hash + 0
 		31 * result + (checksum ^ (checksum >>> 32))
 	}
 

src/groovy/grails/plugin/springcache/key/CacheKeyBuilder.groovy

@@ -26,11 +26,11 @@ import grails.plugin.springcache.CacheKey
 class CacheKeyBuilder {
 
 	private static final int INITIAL_HASH = 17
-	private static final int MULTIPLIER = 31
+	private static final int MULTIPLIER = 63
 
 	private int count = 0
 	private long checksum = 0L
-	private int hash = INITIAL_HASH
+	private long hash = INITIAL_HASH
 
 	CacheKeyBuilder append(int i) {
 		hash = hash * MULTIPLIER + i