keeping the two parts of the GroupId key separate.

John McNally · John McNally · commit 5cc026f03abb · 2002-06-06T05:27:46.000Z
using the GroupId in GroupAttrName instead of only part of it. made appropriate changes to GroupCache to account for the above changes. PR: Obtained from: Submitted by: Reviewed by: git-svn-id: https://svn.apache.org/repos/asf/jakarta/jcs/trunk@223989 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java b/src/java/org/apache/jcs/engine/control/group/GroupAttrName.java
@@ -6,31 +6,32 @@
  * Description of the Class
  *
  * @author asmuts
+ * @author <a href="mailto:jmcnally@apache.org">John McNally</a>
  * @created January 15, 2002
  */
 public class GroupAttrName implements Serializable
 {
     //final GroupId groupId;
     /** Description of the Field */
-    public final String groupId;
-    final Object attrName;
-
+    public final GroupId groupId;
+    public final Object attrName;
+    private String toString;
 
     /**
      * Constructor for the GroupAttrName object
      *
      * @param groupId
      * @param attrName
      */
-    public GroupAttrName( String groupId, Object attrName )
+    public GroupAttrName( GroupId groupId, Object attrName )
     {
-        //this.groupId = new GroupId(groupId);
         this.groupId = groupId;
         this.attrName = attrName;
 
         if ( groupId == null || attrName == null )
         {
-            throw new IllegalArgumentException( "groupId " + groupId + " and attrName " + attrName + ", must not be null." );
+            throw new IllegalArgumentException( "groupId " + groupId + 
+                " and attrName " + attrName + ", must not be null." );
         }
     }
 
@@ -57,7 +58,13 @@ public int hashCode()
     /** Description of the Method */
     public String toString()
     {
-        return "[groupId=" + groupId + ", attrName=" + attrName + "]";
+        if (toString == null) 
+        {
+            toString = "[GAN: groupId=" + groupId + 
+                ", attrName=" + attrName + "]";
+        }
+        
+        return toString;
     }
 
 }
diff --git a/src/java/org/apache/jcs/engine/control/group/GroupCache.java b/src/java/org/apache/jcs/engine/control/group/GroupCache.java
@@ -231,15 +231,15 @@ public ICacheElement getGAN( GroupAttrName key, boolean invocation )
 
         Object obj = null;
         // not necessary?, stops at getaux
-        readLock( key.groupId );
+        readLock( key.groupId.toString() );
         try
         {
             obj = super.get( key, invocation );
             //p( "got obj" );
         }
         finally
         {
-            locker.done( key.groupId );
+            locker.done( key.groupId.toString() );
         }
         return ( ICacheElement ) obj;
     }
@@ -279,18 +279,18 @@ public ICacheElement getGI( GroupId gid, boolean invocation )
             }
         }
         Object obj = null;
-        readLock( gid.key );
+        readLock( gid.toString() );
         try
         {
             if ( invocation )
             {
                 // Invocation is NOT local
-                obj = systemGroupIdCache.localGet( gid.key );
+                obj = systemGroupIdCache.localGet( gid.toString() );
             }
             else
             {
                 // Invocation is local
-                obj = systemGroupIdCache.get( gid.key );
+                obj = systemGroupIdCache.get( gid.toString() );
             }
 
             if ( log.isDebugEnabled() )
@@ -300,7 +300,7 @@ public ICacheElement getGI( GroupId gid, boolean invocation )
         }
         finally
         {
-            locker.done( gid.key );
+            locker.done( gid.toString() );
         }
 
         return ( ICacheElement ) obj;
@@ -581,7 +581,7 @@ public void putGAN( GroupAttrName key, Serializable val,
             log.debug( "in putGAN( gan,val,attr,boolean invocation) " );
         }
 
-        writeLock( key.groupId );
+        writeLock( key.toString() );
         try
         {
 
@@ -598,9 +598,9 @@ public void putGAN( GroupAttrName key, Serializable val,
             super.update( ce, localOnly );
 
             // UPDATE THE ATTRIBUTENAME LIST, get it first
-            GroupId groupId = new GroupId( this.getCacheName(), key.groupId );
+            GroupId groupId = key.groupId;
             HashSet attrNameSet = null;
-            attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.key );
+            attrNameSet = (HashSet)systemGroupIdCache.get(groupId.toString());
 
             if ( attrNameSet == null )
             {
@@ -613,7 +613,7 @@ public void putGAN( GroupAttrName key, Serializable val,
                 log.debug( "putGAN( gan,val,attr,boolean invocation) > attrNameSet.size()  = " + attrNameSet.size() );
             }
 
-            CacheElement ceID = new CacheElement( this.getCacheName(), groupId.key, attrNameSet );
+            CacheElement ceID = new CacheElement( this.getCacheName(), groupId, attrNameSet );
             ceID.setElementAttributes( attrE );
 
             // DO NOT SEND THE UPDATE LIST REMOTELY
@@ -623,7 +623,7 @@ public void putGAN( GroupAttrName key, Serializable val,
         }
         finally
         {
-            locker.done( key.groupId );
+            locker.done( key.toString() );
         }
     }
 
@@ -642,7 +642,7 @@ protected void createGroup( String group, IElementAttributes attrE )
         GroupId groupId = new GroupId( this.getCacheName(), group );
         HashSet attrNameSet = null;
 
-        attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.key );
+        attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.toString() );
 
         if ( attrNameSet == null )
         {
@@ -654,7 +654,7 @@ protected void createGroup( String group, IElementAttributes attrE )
         }
         try
         {
-            CacheElement ceID = new CacheElement( this.getCacheName(), groupId.key, attrNameSet );
+            CacheElement ceID = new CacheElement( this.getCacheName(), groupId, attrNameSet );
             ceID.setElementAttributes( attrE );
             //updateCaches(groupId.key, attrNameSet, attrE );
             //super.update( ceID, EXCLUDE_REMOTE_CACHE );
@@ -807,19 +807,19 @@ public void updateGroupAttrNameSet( GroupAttrName key,
 
         // update the attribute name set.
         // Note: necessary to use super.get to avoid read lock within the current write lock.
-        GroupId groupId = new GroupId( this.getCacheName(), key.groupId );
+        GroupId groupId = key.groupId;
         HashSet attrNameSet = null;
         CacheElement ce = null;
 
         if ( invocation )
         {
             // Invocation is NOT local
-            ce = ( CacheElement ) systemGroupIdCache.localGet( groupId.key );
+            ce = ( CacheElement ) systemGroupIdCache.localGet( groupId.toString() );
         }
         else
         {
             // Invocation is local
-            ce = ( CacheElement ) systemGroupIdCache.get( groupId.key );
+            ce = ( CacheElement ) systemGroupIdCache.get( groupId.toString() );
         }
 
         // IF THE NAME SET IS FOUND
@@ -854,7 +854,7 @@ public void updateGroupAttrNameSet( GroupAttrName key,
 
                         CacheElement ceID
                             = new CacheElement( this.getCacheName(),
-                                                groupId.key,
+                                                groupId,
                                                 attrNameSet );
 
                         ceID.setElementAttributes( ce.attr );
@@ -888,11 +888,11 @@ else if ( remove )
                     // unlike insertion, removal should go remote if locally invoked
                     if ( invocation )
                     {
-                        systemGroupIdCache.localRemove( groupId.key );
+                        systemGroupIdCache.localRemove( groupId.toString() );
                     }
                     else
                     {
-                        systemGroupIdCache.remove( groupId.key );
+                        systemGroupIdCache.remove( groupId.toString() );
                     }
                 }
             }
@@ -936,24 +936,24 @@ protected boolean removeGI( GroupId groupId, boolean invocation, boolean skipLoc
 
         if ( !skipLock )
         {
-            writeLock( groupId.key );
+            writeLock( groupId.toString() );
         }
         try
         {
             if ( invocation )
             {
-                ok = systemGroupIdCache.localRemove( groupId.key );
+                ok = systemGroupIdCache.localRemove( groupId.toString() );
             }
             else
             {
-                ok = systemGroupIdCache.remove( groupId.key );
+                ok = systemGroupIdCache.remove( groupId.toString() );
             }
         }
         finally
         {
             if ( !skipLock )
             {
-                locker.done( groupId.key );
+                locker.done( groupId.toString() );
             }
         }
         return ok;
diff --git a/src/java/org/apache/jcs/engine/control/group/GroupId.java b/src/java/org/apache/jcs/engine/control/group/GroupId.java
@@ -7,54 +7,63 @@
  * cache items in the same cache.
  *
  * @author asmuts
+ * @author <a href="mailto:jmcnally@apache.org">John McNally</a>
  * @created January 15, 2002
  */
 public class GroupId implements Serializable
 {
-
     /** Description of the Field */
-    public final String key;
-
+    public final String groupName;
+    public final String cacheName;
+    private String toString;
 
     /**
      * Constructor for the GroupId object
      *
      * @param cacheName
-     * @param key
+     * @param groupName
      */
-    public GroupId( String cacheName, String key )
+    public GroupId( String cacheName, String groupName )
     {
-        this.key = cacheName + key;
+        this.cacheName = cacheName;
+        this.groupName = groupName;
 
-        if ( key == null )
+        if ( cacheName == null )
+        {
+            throw new IllegalArgumentException("cacheName must not be null.");
+        }
+        if ( groupName == null )
         {
-            throw new IllegalArgumentException( "key must not be null." );
+            throw new IllegalArgumentException("groupName must not be null.");
         }
     }
 
-
     /** Description of the Method */
     public boolean equals( Object obj )
     {
-        if ( obj == null || !( obj instanceof GroupId ) )
+        if ( obj == null || !(obj instanceof GroupId) )
         {
             return false;
         }
-        GroupId to = ( GroupId ) obj;
-        return key.equals( to.key );
+        GroupId g = (GroupId)obj;
+        return cacheName.equals(g.cacheName) && groupName.equals(g.groupName);
     }
 
 
     /** Description of the Method */
     public int hashCode()
     {
-        return key.hashCode();
+        return cacheName.hashCode() + groupName.hashCode();
     }
 
-
     /** Description of the Method */
     public String toString()
     {
-        return "[grouId=" + key + "]";
+        if (toString == null) 
+        {
+            toString = "[groupId=" + cacheName + ", " + groupName + ']';
+        }
+        
+        return toString;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -6,31 +6,32 @@`
`6`	`6`	`* Description of the Class`
`7`	`7`	`*`
`8`	`8`	`* @author asmuts`
	`9`	`+ * @author <a href="mailto:jmcnally@apache.org">John McNally</a>`
`9`	`10`	`* @created January 15, 2002`
`10`	`11`	`*/`
`11`	`12`	`public class GroupAttrName implements Serializable`
`12`	`13`	`{`
`13`	`14`	`//final GroupId groupId;`
`14`	`15`	`/** Description of the Field */`
`15`		`- public final String groupId;`
`16`		`- final Object attrName;`
`17`		`-`
	`16`	`+ public final GroupId groupId;`
	`17`	`+ public final Object attrName;`
	`18`	`+ private String toString;`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* Constructor for the GroupAttrName object`
`21`	`22`	`*`
`22`	`23`	`* @param groupId`
`23`	`24`	`* @param attrName`
`24`	`25`	`*/`
`25`		`- public GroupAttrName( String groupId, Object attrName )`
	`26`	`+ public GroupAttrName( GroupId groupId, Object attrName )`
`26`	`27`	`{`
`27`		`- //this.groupId = new GroupId(groupId);`
`28`	`28`	`this.groupId = groupId;`
`29`	`29`	`this.attrName = attrName;`
`30`	`30`
`31`	`31`	`if ( groupId == null \|\| attrName == null )`
`32`	`32`	`{`
`33`		`- throw new IllegalArgumentException( "groupId " + groupId + " and attrName " + attrName + ", must not be null." );`
	`33`	`+ throw new IllegalArgumentException( "groupId " + groupId +`
	`34`	`+ " and attrName " + attrName + ", must not be null." );`
`34`	`35`	`}`
`35`	`36`	`}`
`36`	`37`
`@@ -57,7 +58,13 @@ public int hashCode()`
`57`	`58`	`/** Description of the Method */`
`58`	`59`	`public String toString()`
`59`	`60`	`{`
`60`		`- return "[groupId=" + groupId + ", attrName=" + attrName + "]";`
	`61`	`+ if (toString == null)`
	`62`	`+ {`
	`63`	`+ toString = "[GAN: groupId=" + groupId +`
	`64`	`+ ", attrName=" + attrName + "]";`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ return toString;`
`61`	`68`	`}`
`62`	`69`
`63`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,15 +231,15 @@ public ICacheElement getGAN( GroupAttrName key, boolean invocation )`
`231`	`231`
`232`	`232`	`Object obj = null;`
`233`	`233`	`// not necessary?, stops at getaux`
`234`		`- readLock( key.groupId );`
	`234`	`+ readLock( key.groupId.toString() );`
`235`	`235`	`try`
`236`	`236`	`{`
`237`	`237`	`obj = super.get( key, invocation );`
`238`	`238`	`//p( "got obj" );`
`239`	`239`	`}`
`240`	`240`	`finally`
`241`	`241`	`{`
`242`		`- locker.done( key.groupId );`
	`242`	`+ locker.done( key.groupId.toString() );`
`243`	`243`	`}`
`244`	`244`	`return ( ICacheElement ) obj;`
`245`	`245`	`}`
`@@ -279,18 +279,18 @@ public ICacheElement getGI( GroupId gid, boolean invocation )`
`279`	`279`	`}`
`280`	`280`	`}`
`281`	`281`	`Object obj = null;`
`282`		`- readLock( gid.key );`
	`282`	`+ readLock( gid.toString() );`
`283`	`283`	`try`
`284`	`284`	`{`
`285`	`285`	`if ( invocation )`
`286`	`286`	`{`
`287`	`287`	`// Invocation is NOT local`
`288`		`- obj = systemGroupIdCache.localGet( gid.key );`
	`288`	`+ obj = systemGroupIdCache.localGet( gid.toString() );`
`289`	`289`	`}`
`290`	`290`	`else`
`291`	`291`	`{`
`292`	`292`	`// Invocation is local`
`293`		`- obj = systemGroupIdCache.get( gid.key );`
	`293`	`+ obj = systemGroupIdCache.get( gid.toString() );`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`if ( log.isDebugEnabled() )`
`@@ -300,7 +300,7 @@ public ICacheElement getGI( GroupId gid, boolean invocation )`
`300`	`300`	`}`
`301`	`301`	`finally`
`302`	`302`	`{`
`303`		`- locker.done( gid.key );`
	`303`	`+ locker.done( gid.toString() );`
`304`	`304`	`}`
`305`	`305`
`306`	`306`	`return ( ICacheElement ) obj;`
`@@ -581,7 +581,7 @@ public void putGAN( GroupAttrName key, Serializable val,`
`581`	`581`	`log.debug( "in putGAN( gan,val,attr,boolean invocation) " );`
`582`	`582`	`}`
`583`	`583`
`584`		`- writeLock( key.groupId );`
	`584`	`+ writeLock( key.toString() );`
`585`	`585`	`try`
`586`	`586`	`{`
`587`	`587`
`@@ -598,9 +598,9 @@ public void putGAN( GroupAttrName key, Serializable val,`
`598`	`598`	`super.update( ce, localOnly );`
`599`	`599`
`600`	`600`	`// UPDATE THE ATTRIBUTENAME LIST, get it first`
`601`		`- GroupId groupId = new GroupId( this.getCacheName(), key.groupId );`
	`601`	`+ GroupId groupId = key.groupId;`
`602`	`602`	`HashSet attrNameSet = null;`
`603`		`- attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.key );`
	`603`	`+ attrNameSet = (HashSet)systemGroupIdCache.get(groupId.toString());`
`604`	`604`
`605`	`605`	`if ( attrNameSet == null )`
`606`	`606`	`{`
`@@ -613,7 +613,7 @@ public void putGAN( GroupAttrName key, Serializable val,`
`613`	`613`	`log.debug( "putGAN( gan,val,attr,boolean invocation) > attrNameSet.size() = " + attrNameSet.size() );`
`614`	`614`	`}`
`615`	`615`
`616`		`- CacheElement ceID = new CacheElement( this.getCacheName(), groupId.key, attrNameSet );`
	`616`	`+ CacheElement ceID = new CacheElement( this.getCacheName(), groupId, attrNameSet );`
`617`	`617`	`ceID.setElementAttributes( attrE );`
`618`	`618`
`619`	`619`	`// DO NOT SEND THE UPDATE LIST REMOTELY`
`@@ -623,7 +623,7 @@ public void putGAN( GroupAttrName key, Serializable val,`
`623`	`623`	`}`
`624`	`624`	`finally`
`625`	`625`	`{`
`626`		`- locker.done( key.groupId );`
	`626`	`+ locker.done( key.toString() );`
`627`	`627`	`}`
`628`	`628`	`}`
`629`	`629`
`@@ -642,7 +642,7 @@ protected void createGroup( String group, IElementAttributes attrE )`
`642`	`642`	`GroupId groupId = new GroupId( this.getCacheName(), group );`
`643`	`643`	`HashSet attrNameSet = null;`
`644`	`644`
`645`		`- attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.key );`
	`645`	`+ attrNameSet = ( HashSet ) systemGroupIdCache.get( groupId.toString() );`
`646`	`646`
`647`	`647`	`if ( attrNameSet == null )`
`648`	`648`	`{`
`@@ -654,7 +654,7 @@ protected void createGroup( String group, IElementAttributes attrE )`
`654`	`654`	`}`
`655`	`655`	`try`
`656`	`656`	`{`
`657`		`- CacheElement ceID = new CacheElement( this.getCacheName(), groupId.key, attrNameSet );`
	`657`	`+ CacheElement ceID = new CacheElement( this.getCacheName(), groupId, attrNameSet );`
`658`	`658`	`ceID.setElementAttributes( attrE );`
`659`	`659`	`//updateCaches(groupId.key, attrNameSet, attrE );`
`660`	`660`	`//super.update( ceID, EXCLUDE_REMOTE_CACHE );`
`@@ -807,19 +807,19 @@ public void updateGroupAttrNameSet( GroupAttrName key,`
`807`	`807`
`808`	`808`	`// update the attribute name set.`
`809`	`809`	`// Note: necessary to use super.get to avoid read lock within the current write lock.`
`810`		`- GroupId groupId = new GroupId( this.getCacheName(), key.groupId );`
	`810`	`+ GroupId groupId = key.groupId;`
`811`	`811`	`HashSet attrNameSet = null;`
`812`	`812`	`CacheElement ce = null;`
`813`	`813`
`814`	`814`	`if ( invocation )`
`815`	`815`	`{`
`816`	`816`	`// Invocation is NOT local`
`817`		`- ce = ( CacheElement ) systemGroupIdCache.localGet( groupId.key );`
	`817`	`+ ce = ( CacheElement ) systemGroupIdCache.localGet( groupId.toString() );`
`818`	`818`	`}`
`819`	`819`	`else`
`820`	`820`	`{`
`821`	`821`	`// Invocation is local`
`822`		`- ce = ( CacheElement ) systemGroupIdCache.get( groupId.key );`
	`822`	`+ ce = ( CacheElement ) systemGroupIdCache.get( groupId.toString() );`
`823`	`823`	`}`
`824`	`824`
`825`	`825`	`// IF THE NAME SET IS FOUND`
`@@ -854,7 +854,7 @@ public void updateGroupAttrNameSet( GroupAttrName key,`
`854`	`854`
`855`	`855`	`CacheElement ceID`
`856`	`856`	`= new CacheElement( this.getCacheName(),`
`857`		`- groupId.key,`
	`857`	`+ groupId,`
`858`	`858`	`attrNameSet );`
`859`	`859`
`860`	`860`	`ceID.setElementAttributes( ce.attr );`
`@@ -888,11 +888,11 @@ else if ( remove )`
`888`	`888`	`// unlike insertion, removal should go remote if locally invoked`
`889`	`889`	`if ( invocation )`
`890`	`890`	`{`
`891`		`- systemGroupIdCache.localRemove( groupId.key );`
	`891`	`+ systemGroupIdCache.localRemove( groupId.toString() );`
`892`	`892`	`}`
`893`	`893`	`else`
`894`	`894`	`{`
`895`		`- systemGroupIdCache.remove( groupId.key );`
	`895`	`+ systemGroupIdCache.remove( groupId.toString() );`
`896`	`896`	`}`
`897`	`897`	`}`
`898`	`898`	`}`
`@@ -936,24 +936,24 @@ protected boolean removeGI( GroupId groupId, boolean invocation, boolean skipLoc`
`936`	`936`
`937`	`937`	`if ( !skipLock )`
`938`	`938`	`{`
`939`		`- writeLock( groupId.key );`
	`939`	`+ writeLock( groupId.toString() );`
`940`	`940`	`}`
`941`	`941`	`try`
`942`	`942`	`{`
`943`	`943`	`if ( invocation )`
`944`	`944`	`{`
`945`		`- ok = systemGroupIdCache.localRemove( groupId.key );`
	`945`	`+ ok = systemGroupIdCache.localRemove( groupId.toString() );`
`946`	`946`	`}`
`947`	`947`	`else`
`948`	`948`	`{`
`949`		`- ok = systemGroupIdCache.remove( groupId.key );`
	`949`	`+ ok = systemGroupIdCache.remove( groupId.toString() );`
`950`	`950`	`}`
`951`	`951`	`}`
`952`	`952`	`finally`
`953`	`953`	`{`
`954`	`954`	`if ( !skipLock )`
`955`	`955`	`{`
`956`		`- locker.done( groupId.key );`
	`956`	`+ locker.done( groupId.toString() );`
`957`	`957`	`}`
`958`	`958`	`}`
`959`	`959`	`return ok;`
Original file line number	Diff line number	Diff line change
`@@ -7,54 +7,63 @@`
`7`	`7`	`* cache items in the same cache.`
`8`	`8`	`*`
`9`	`9`	`* @author asmuts`
	`10`	`+ * @author <a href="mailto:jmcnally@apache.org">John McNally</a>`
`10`	`11`	`* @created January 15, 2002`
`11`	`12`	`*/`
`12`	`13`	`public class GroupId implements Serializable`
`13`	`14`	`{`
`14`		`-`
`15`	`15`	`/** Description of the Field */`
`16`		`- public final String key;`
`17`		`-`
	`16`	`+ public final String groupName;`
	`17`	`+ public final String cacheName;`
	`18`	`+ private String toString;`
`18`	`19`
`19`	`20`	`/**`
`20`	`21`	`* Constructor for the GroupId object`
`21`	`22`	`*`
`22`	`23`	`* @param cacheName`
`23`		`- * @param key`
	`24`	`+ * @param groupName`
`24`	`25`	`*/`
`25`		`- public GroupId( String cacheName, String key )`
	`26`	`+ public GroupId( String cacheName, String groupName )`
`26`	`27`	`{`
`27`		`- this.key = cacheName + key;`
	`28`	`+ this.cacheName = cacheName;`
	`29`	`+ this.groupName = groupName;`
`28`	`30`
`29`		`- if ( key == null )`
	`31`	`+ if ( cacheName == null )`
	`32`	`+ {`
	`33`	`+ throw new IllegalArgumentException("cacheName must not be null.");`
	`34`	`+ }`
	`35`	`+ if ( groupName == null )`
`30`	`36`	`{`
`31`		`- throw new IllegalArgumentException( "key must not be null." );`
	`37`	`+ throw new IllegalArgumentException("groupName must not be null.");`
`32`	`38`	`}`
`33`	`39`	`}`
`34`	`40`
`35`		`-`
`36`	`41`	`/** Description of the Method */`
`37`	`42`	`public boolean equals( Object obj )`
`38`	`43`	`{`
`39`		`- if ( obj == null \|\| !( obj instanceof GroupId ) )`
	`44`	`+ if ( obj == null \|\| !(obj instanceof GroupId) )`
`40`	`45`	`{`
`41`	`46`	`return false;`
`42`	`47`	`}`
`43`		`- GroupId to = ( GroupId ) obj;`
`44`		`- return key.equals( to.key );`
	`48`	`+ GroupId g = (GroupId)obj;`
	`49`	`+ return cacheName.equals(g.cacheName) && groupName.equals(g.groupName);`
`45`	`50`	`}`
`46`	`51`
`47`	`52`
`48`	`53`	`/** Description of the Method */`
`49`	`54`	`public int hashCode()`
`50`	`55`	`{`
`51`		`- return key.hashCode();`
	`56`	`+ return cacheName.hashCode() + groupName.hashCode();`
`52`	`57`	`}`
`53`	`58`
`54`		`-`
`55`	`59`	`/** Description of the Method */`
`56`	`60`	`public String toString()`
`57`	`61`	`{`
`58`		`- return "[grouId=" + key + "]";`
	`62`	`+ if (toString == null)`
	`63`	`+ {`
	`64`	`+ toString = "[groupId=" + cacheName + ", " + groupName + ']';`
	`65`	`+ }`
	`66`	`+`
	`67`	`+ return toString;`
`59`	`68`	`}`
`60`	`69`	`}`