portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "Weaver, Scott" <Swea...@rippe.com>
Subject RE: cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/om/ registry/base BaseSecurityAccess.java
Date Wed, 05 Nov 2003 20:19:36 GMT
Sorry, I'll take a look.

*================================* 
| Scott T Weaver                 |
| <weaver@apache.org>            | 
| Apache Jetspeed Portal Project |
| Apache Pluto Portlet Container |
*================================*

> -----Original Message-----
> From: Mark Orciuch [mailto:mark_orciuch@ngsltd.com]
> Sent: Wednesday, November 05, 2003 3:10 PM
> To: Jetspeed Developers List
> Subject: RE: cvs commit: jakarta-
> jetspeed/src/java/org/apache/jetspeed/om/registry/base
> BaseSecurityAccess.java
> 
> Scott,
> 
> Does this match any of the existing Bugzilla issues? If so, could you
> close
> it. If not, could you please create one. This way we know that it was
> addressed. Thanks!
> 
> Best regards,
> 
> Mark Orciuch - morciuch@apache.org
> Jakarta Jetspeed - Enterprise Portal in Java
> http://jakarta.apache.org/jetspeed/
> 
> > -----Original Message-----
> > From: weaver@apache.org [mailto:weaver@apache.org]
> > Sent: Wednesday, November 05, 2003 12:45 PM
> > To: jakarta-jetspeed-cvs@apache.org
> > Subject: cvs commit:
> > jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base
> > BaseSecurityAccess.java
> >
> >
> > weaver      2003/11/05 10:44:43
> >
> >   Modified:    src/java/org/apache/jetspeed/om/registry/base
> >                         BaseSecurityAccess.java
> >   Log:
> >   Fixed the occasional ClassCastException that was happening in
> > BaseSecurityAccess'
> >
> >   equals() method.  This could also cause the RegistryWatcher
> > thread to lock.
> >
> >   Revision  Changes    Path
> >   1.9       +11 -10
> > jakarta-jetspeed/src/java/org/apache/jetspeed/om/registry/base/Bas
> > eSecurityAccess.java
> >
> >   Index: BaseSecurityAccess.java
> >   ===================================================================
> >   RCS file:
> > /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/om/registr
> > y/base/BaseSecurityAccess.java,v
> >   retrieving revision 1.8
> >   retrieving revision 1.9
> >   diff -u -r1.8 -r1.9
> >   --- BaseSecurityAccess.java	13 Aug 2003 05:01:02 -0000	1.8
> >   +++ BaseSecurityAccess.java	5 Nov 2003 18:44:43 -0000	1.9
> >   @@ -60,6 +60,7 @@
> >
> >    // Jetspeed imports
> >    import org.apache.jetspeed.om.registry.SecurityAccess;
> >   +import org.apache.jetspeed.om.registry.SecurityAllow;
> >
> >    /**
> >     * Interface for manipulatin the Security Access on the
> > registry entries
> >   @@ -93,38 +94,38 @@
> >         */
> >        public boolean equals(Object object)
> >        {
> >   -        if (object == null)
> >   +        if (object == null || (object instanceof SecurityAccess))
> >            {
> >                return false;
> >            }
> >
> >   -        BaseSecurityAccess obj = (BaseSecurityAccess) object;
> >   +        SecurityAccess obj = (SecurityAccess) object;
> >
> >            if (action != null)
> >            {
> >   -            if (!action.equals(obj.action))
> >   +            if (!action.equals(obj.getAction()))
> >                {
> >                    return false;
> >                }
> >            }
> >            else
> >            {
> >   -            if (obj.action != null)
> >   +            if (obj.getAction() != null)
> >                {
> >                    return false;
> >                }
> >            }
> >
> >            Iterator i = allows.iterator();
> >   -        Iterator i2 = obj.allows.iterator();
> >   +        Iterator i2 = obj.getAllows().iterator();
> >            while (i.hasNext())
> >            {
> >   -            BaseSecurityAllow c1 = (BaseSecurityAllow) i.next();
> >   -            BaseSecurityAllow c2 = null;
> >   +            SecurityAllow c1 = (SecurityAllow) i.next();
> >   +            SecurityAllow c2 = null;
> >
> >                if (i2.hasNext())
> >                {
> >   -                c2 = (BaseSecurityAllow) i2.next();
> >   +                c2 = (SecurityAllow) i2.next();
> >                }
> >                else
> >                {
> >   @@ -143,7 +144,7 @@
> >            }
> >
> >            i = ownerAllows.iterator();
> >   -        i2 = obj.ownerAllows.iterator();
> >   +        i2 = obj.getOwnerAllows().iterator();
> >            while (i.hasNext())
> >            {
> >                BaseSecurityAllowOwner c1 =
> > (BaseSecurityAllowOwner) i.next();
> >
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
> > For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org
> >
> >
> >
> >
> 
> 
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message