sgala 01/09/04 05:09:31
Modified: src/java/org/apache/jetspeed/services/profiler
JetspeedProfilerService.java
src/java/org/apache/jetspeed/services/psmlmanager
CastorPsmlManagerService.java
src/java/org/apache/jetspeed/services/rundata
DefaultJetspeedRunData.java
Log:
Logging of exceptions and bug fix in CastorPsmlManagerService
Revision Changes Path
1.14 +4 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java
Index: JetspeedProfilerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/profiler/JetspeedProfilerService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JetspeedProfilerService.java 2001/07/30 03:50:07 1.13
+++ JetspeedProfilerService.java 2001/09/04 12:09:30 1.14
@@ -131,7 +131,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: JetspeedProfilerService.java,v 1.13 2001/07/30 03:50:07 taylor Exp
$
+ * @version $Id: JetspeedProfilerService.java,v 1.14 2001/09/04 12:09:30 sgala Exp $
*/
public class JetspeedProfilerService extends TurbineBaseService
@@ -468,6 +468,8 @@
*/
protected PSMLDocument fallback( ProfileLocator locator, RunData rundata )
{
+ Log.debug( "Profiler fallback called with: " + locator );
+
PSMLDocument doc = PsmlManager.getDocument( locator );
if (null != doc)
return doc;
@@ -706,4 +708,4 @@
return PsmlManager.query( locator );
}
-}
\ No newline at end of file
+}
1.9 +16 -8
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java
Index: CastorPsmlManagerService.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/CastorPsmlManagerService.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CastorPsmlManagerService.java 2001/07/30 03:50:07 1.8
+++ CastorPsmlManagerService.java 2001/09/04 12:09:30 1.9
@@ -108,7 +108,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>David Sean Taylor</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
- * @version $Id: CastorPsmlManagerService.java,v 1.8 2001/07/30 03:50:07 taylor Exp
$
+ * @version $Id: CastorPsmlManagerService.java,v 1.9 2001/09/04 12:09:30 sgala Exp $
*/
public class CastorPsmlManagerService extends TurbineBaseService
implements PsmlManagerService
@@ -278,11 +278,6 @@
*
* @param locator The locator descriptor of the document to be retrieved.
*/
- /**
- * Returns a PSML document for the given locator
- *
- * @param locator The locator descriptor of the document to be retrieved.
- */
public PSMLDocument getDocument( ProfileLocator locator )
{
if (locator == null)
@@ -308,7 +303,20 @@
if (ref != null)
{
- profile = (Profile)ref.get();
+ /**
+ * Christophe Mestrallet ([EMAIL PROTECTED])
+ * detected problems here.
+ * Since there is a fallback (reloading) I (SGP) will
+ * just catch the exception. The real problem is down, when
+ * we used a null profile as a key (profile --> newProfile)
+ */
+ try
+ {
+ profile = (Profile)ref.get();
+ } catch ( ClassCastException e )
+ {
+ Log.error( e );
+ }
}
if (profile == null)
@@ -325,7 +333,7 @@
// store the document in the hash and reference it to the watcher
Profile newProfile = new BaseProfile(locator);
newProfile.setDocument(doc);
- documents.put(name, new WeakReference(profile));
+ documents.put(name, new WeakReference(newProfile));
}
}
else
1.4 +13 -2
jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java
Index: DefaultJetspeedRunData.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/rundata/DefaultJetspeedRunData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultJetspeedRunData.java 2001/07/22 19:04:32 1.3
+++ DefaultJetspeedRunData.java 2001/09/04 12:09:30 1.4
@@ -54,6 +54,8 @@
package org.apache.jetspeed.services.rundata;
+import org.apache.turbine.util.Log;
+
import org.apache.jetspeed.portal.Portlet;
import org.apache.jetspeed.om.profile.Profile;
import org.apache.jetspeed.capability.CapabilityMap;
@@ -70,7 +72,8 @@
* interface in future releases of Turbine</note>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rapha�l Luta</a>
- * @version $Id: DefaultJetspeedRunData.java,v 1.3 2001/07/22 19:04:32 raphael Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Santiago Gala</a>
+ * @version $Id: DefaultJetspeedRunData.java,v 1.4 2001/09/04 12:09:30 sgala Exp $
*/
public class DefaultJetspeedRunData extends DefaultTurbineRunData
implements JetspeedRunData
@@ -234,7 +237,15 @@
*/
public Profile getProfile()
{
- return (Profile)this.getUser().getTemp("profile");
+ try
+ {
+ return (Profile)this.getUser().getTemp("profile");
+ } catch (Throwable t)
+ {
+ Log.error( "Captured Exception: " );
+ Log.error( t );
+ }
+ return null;
}
/** Clears the state of this object for recycling... */
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
