portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wea...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit JetspeedPortalToolkitService.java
Date Fri, 11 Apr 2003 16:01:57 GMT
weaver      2003/04/11 09:01:57

  Modified:    src/java/org/apache/jetspeed/services JetspeedSecurity.java
               src/java/org/apache/jetspeed/services/portaltoolkit
                        JetspeedPortalToolkitService.java
  Log:
  Fixed issues certain methods in JetspeedSecurity and JetspeedPortalToolkitService
  causing nullpointerexeptions when the basic JUnit tests are run.
  
  Revision  Changes    Path
  1.17      +2 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedSecurity.java
  
  Index: JetspeedSecurity.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/JetspeedSecurity.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JetspeedSecurity.java	11 Apr 2003 13:20:51 -0000	1.16
  +++ JetspeedSecurity.java	11 Apr 2003 16:01:57 -0000	1.17
  @@ -786,7 +786,7 @@
           }
           
           // still no security? go with the default.
  -        if (securityRef == null)
  +        if (securityRef == null && rundata != null)
           {          
               securityRef = PortalToolkit.getDefaultSecurityRef(rundata.getProfile());  
       
           }
  
  
  
  1.29      +5 -2      jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java
  
  Index: JetspeedPortalToolkitService.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/portaltoolkit/JetspeedPortalToolkitService.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- JetspeedPortalToolkitService.java	2 Apr 2003 15:09:58 -0000	1.28
  +++ JetspeedPortalToolkitService.java	11 Apr 2003 16:01:57 -0000	1.29
  @@ -391,7 +391,10 @@
           JetspeedRunDataService jrds =
               (JetspeedRunDataService) ServiceUtil.getServiceByName(RunDataService.SERVICE_NAME);
           JetspeedRunData jData = jrds.getCurrentRunData();
  -        result.setCapabilityMap(jData.getCapability()); 
  +        if(jData != null)
  +        {
  +        	result.setCapabilityMap(jData.getCapability()); 
  +        }
           return result;
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message