vgritsenko 2002/06/28 06:26:23
Modified: . Tag: cocoon_2_0_3_branch changes.xml
. changes.xml
src/java/org/apache/cocoon/components/notification Tag:
cocoon_2_0_3_branch DefaultNotifyingBuilder.java
Log:
don't put null in extra descriptions
Revision Changes Path
No revision
No revision
1.138.2.27 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.138.2.26
retrieving revision 1.138.2.27
diff -u -r1.138.2.26 -r1.138.2.27
--- changes.xml 28 Jun 2002 08:14:59 -0000 1.138.2.26
+++ changes.xml 28 Jun 2002 13:26:22 -0000 1.138.2.27
@@ -38,6 +38,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix" fixes-bug="10311" due-to="Joachim Piketz"
due-to-email="[EMAIL PROTECTED]">
+ Fix NullPointerException in Notifier.
+ </action>
<action dev="CH" type="update">
Multiple results seem not to be supported by some DBMSs (i.e. Oracle and
Informix). Therefore this is made optional in ESQL. A new parameter
1.200 +4 -1 xml-cocoon2/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/xml-cocoon2/changes.xml,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- changes.xml 28 Jun 2002 08:22:56 -0000 1.199
+++ changes.xml 28 Jun 2002 13:26:23 -0000 1.200
@@ -39,6 +39,9 @@
</devs>
<release version="@version@" date="@date@">
+ <action dev="VG" type="fix" fixes-bug="10311" due-to="Joachim Piketz"
due-to-email="[EMAIL PROTECTED]">
+ Fix NullPointerException in Notifier.
+ </action>
<action dev="CZ" type="fix" fixes-bug="10254" due-to="Stuart Roebuck"
due-to-email="[EMAIL PROTECTED] ">
Applied patch for MaybeUploadRequestFactoryImpl which sets the timeout
for a session to
infinite during an upload and restores it afterwards.
No revision
No revision
1.6.2.2 +6 -8
xml-cocoon2/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java
Index: DefaultNotifyingBuilder.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/notification/DefaultNotifyingBuilder.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- DefaultNotifyingBuilder.java 7 May 2002 20:36:57 -0000 1.6.2.1
+++ DefaultNotifyingBuilder.java 28 Jun 2002 13:26:23 -0000 1.6.2.2
@@ -100,25 +100,23 @@
SAXParseException saxParseException = (SAXParseException)
rootCauseThrowable;
n.setMessage (
saxParseException.getMessage() );
- n.addExtraDescription("location",
saxParseException.getSystemId() );
+ n.addExtraDescription("location",
String.valueOf(saxParseException.getSystemId()) );
n.addExtraDescription("line" ,
String.valueOf(saxParseException.getLineNumber()) );
n.addExtraDescription("column" ,
String.valueOf(saxParseException.getColumnNumber()));
- }
- else if (rootCauseThrowable instanceof TransformerException) {
+ } else if (rootCauseThrowable instanceof TransformerException) {
TransformerException transformerException =
(TransformerException) rootCauseThrowable;
SourceLocator sourceLocator = transformerException.getLocator();
n.setMessage (
transformerException.getMessage());
if( null != sourceLocator )
{
- n.addExtraDescription("location",
sourceLocator.getSystemId() );
+ n.addExtraDescription("location",
String.valueOf(sourceLocator.getSystemId()) );
n.addExtraDescription("line" ,
String.valueOf(sourceLocator.getLineNumber()) );
n.addExtraDescription("column" ,
String.valueOf(sourceLocator.getColumnNumber()) );
}
- }
- else{
+ } else {
n.setMessage(t.getMessage());
- }
+ }
n.setDescription(t.toString());
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
