cziegeler 2004/01/08 05:33:53
Modified: src/blocks/portal/java/org/apache/cocoon/portal/util
CopletDataReferenceFieldHandler.java
CopletBaseDataReferenceFieldHandler.java
AbstractFieldHandler.java
CopletInstanceDataReferenceFieldHandler.java
src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
AuthenticationProfileManager.java
Log:
Log exceptions during loading
Revision Changes Path
1.5 +3 -2
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java
Index: CopletDataReferenceFieldHandler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletDataReferenceFieldHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopletDataReferenceFieldHandler.java 19 Aug 2003 14:09:34 -0000
1.4
+++ CopletDataReferenceFieldHandler.java 8 Jan 2004 13:33:52 -0000
1.5
@@ -81,9 +81,10 @@
public void setValue(Object object, Object value) {
CopletData copletData = (CopletData) getObjectMap().get(value);
- if (copletData == null)
+ if (copletData == null) {
throw new IllegalArgumentException(
"Referenced Coplet Data " + value + " does not exist.");
+ }
((CopletInstanceData) object).setCopletData(copletData);
}
}
1.5 +5 -6
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java
Index: CopletBaseDataReferenceFieldHandler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletBaseDataReferenceFieldHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CopletBaseDataReferenceFieldHandler.java 19 Aug 2003 14:09:34 -0000
1.4
+++ CopletBaseDataReferenceFieldHandler.java 8 Jan 2004 13:33:52 -0000
1.5
@@ -64,8 +64,7 @@
extends ReferenceFieldHandler {
public Object getValue(Object object) {
- CopletBaseData copletBaseData =
- ((CopletData) object).getCopletBaseData();
+ CopletBaseData copletBaseData = ((CopletData)
object).getCopletBaseData();
if (copletBaseData != null) {
return copletBaseData.getId();
} else {
@@ -82,11 +81,11 @@
}
public void setValue(Object object, Object value) {
- CopletBaseData copletBaseData =
- (CopletBaseData) getObjectMap().get(value);
- if (copletBaseData == null)
+ CopletBaseData copletBaseData = (CopletBaseData)
getObjectMap().get(value);
+ if (copletBaseData == null) {
throw new IllegalArgumentException(
"Referenced Coplet Base Data " + value + " does not exist.");
+ }
((CopletData) object).setCopletBaseData(copletBaseData);
}
}
1.2 +3 -4
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/AbstractFieldHandler.java
Index: AbstractFieldHandler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/AbstractFieldHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractFieldHandler.java 19 Aug 2003 14:09:34 -0000 1.1
+++ AbstractFieldHandler.java 8 Jan 2004 13:33:52 -0000 1.2
@@ -62,11 +62,10 @@
/* (non-Javadoc)
* @see
org.exolab.castor.mapping.ExtendedFieldHandler#newInstance(java.lang.Object,
java.lang.Object[])
*/
- public Object newInstance(Object arg0, Object[] arg1)
- throws IllegalStateException {
+ public Object newInstance(Object arg0, Object[] arg1) {
if ( arg1 == null ) {
return this.newInstance(arg0);
}
- throw new IllegalStateException("Construction is not supported.");
+ throw new IllegalStateException("Constructor is not supported.");
}
}
1.4 +5 -3
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java
Index: CopletInstanceDataReferenceFieldHandler.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/util/CopletInstanceDataReferenceFieldHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CopletInstanceDataReferenceFieldHandler.java 19 Aug 2003 14:09:34
-0000 1.3
+++ CopletInstanceDataReferenceFieldHandler.java 8 Jan 2004 13:33:52
-0000 1.4
@@ -82,8 +82,10 @@
public void setValue(Object object, Object value) {
CopletInstanceData copletInstanceData =
(CopletInstanceData)getObjectMap().get(value);
- if (copletInstanceData == null)
- throw new IllegalArgumentException("Referenced Coplet
Instance Data "+value+" does not exist.");
+ if (copletInstanceData == null) {
+ throw new IllegalArgumentException(
+ "Referenced Coplet Instance Data "+value+" does not
exist.");
+ }
((CopletLayout)object).setCopletInstanceData(copletInstanceData);
}
}
1.14 +4 -1
cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java
Index: AuthenticationProfileManager.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/AuthenticationProfileManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AuthenticationProfileManager.java 10 Dec 2003 17:02:04 -0000 1.13
+++ AuthenticationProfileManager.java 8 Jan 2004 13:33:53 -0000 1.14
@@ -356,6 +356,9 @@
}
return new Object[]{object, Boolean.TRUE};
+ } catch (Exception t) {
+ this.getLogger().error("Error loading profile.", t);
+ throw t;
} finally {
this.manager.release(adapter);
}
