vladimir 2003/08/11 19:57:30
Modified: java/src/org/apache/xindice/xml/dom ContainerNodeImpl.java
DocumentImpl.java CharacterDataImpl.java
ProcessingInstructionImpl.java ElementImpl.java
EntityReferenceImpl.java
java/src/org/apache/xindice/core/filer FSFiler.java
BTree.java HashFiler.java BTreeFiler.java
java/src/org/apache/xindice/core/xupdate
XUpdateQueryResolver.java
java/src/org/apache/xindice/xml/jaxp
DocumentBuilderImpl.java
java/src/org/apache/xindice/core CollectionManager.java
Database.java Collection.java
java/src/org/apache/xindice/core/indexer IndexManager.java
NameIndexer.java ValueIndexer.java
java/src/org/apache/xindice/tools/command XUpdate.java
XPathQuery.java
java/src/org/apache/xindice/util Configuration.java
java/src/org/apache/xindice/core/request URIMapper.java
java/src/org/apache/xindice/server XindiceServlet.java
java/src/org/apache/xindice/core/query QueryEngine.java
XPathQueryResolver.java
java/src/org/apache/xindice/xml TextWriter.java
Log:
adding message when logging an exception
Revision Changes Path
1.14 +5 -3
xml-xindice/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java
Index: ContainerNodeImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/ContainerNodeImpl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ContainerNodeImpl.java 9 Aug 2003 21:19:52 -0000 1.13
+++ ContainerNodeImpl.java 12 Aug 2003 02:57:29 -0000 1.14
@@ -131,7 +131,9 @@
loadChildren(doc.getSymbols());
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.12 +8 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java
Index: DocumentImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/DocumentImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DocumentImpl.java 9 Aug 2003 18:56:18 -0000 1.11
+++ DocumentImpl.java 12 Aug 2003 02:57:29 -0000 1.12
@@ -174,7 +174,9 @@
loadChildren(symbols);
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -470,7 +472,9 @@
return result;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
return null;
}
}
1.10 +5 -3
xml-xindice/java/src/org/apache/xindice/xml/dom/CharacterDataImpl.java
Index: CharacterDataImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/CharacterDataImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CharacterDataImpl.java 9 Aug 2003 05:01:55 -0000 1.9
+++ CharacterDataImpl.java 12 Aug 2003 02:57:29 -0000 1.10
@@ -124,7 +124,9 @@
nodeValue = new String(buf, "UTF-8");
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.12 +5 -3
xml-xindice/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java
Index: ProcessingInstructionImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/ProcessingInstructionImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProcessingInstructionImpl.java 9 Aug 2003 21:19:52 -0000 1.11
+++ ProcessingInstructionImpl.java 12 Aug 2003 02:57:29 -0000 1.12
@@ -124,7 +124,9 @@
nodeValue = value.substring(i + 1);
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.16 +8 -4
xml-xindice/java/src/org/apache/xindice/xml/dom/ElementImpl.java
Index: ElementImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/ElementImpl.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ElementImpl.java 9 Aug 2003 18:56:18 -0000 1.15
+++ ElementImpl.java 12 Aug 2003 02:57:29 -0000 1.16
@@ -100,7 +100,9 @@
try {
loadAttributes(doc.getSymbols());
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -147,7 +149,9 @@
loadChildren(st);
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.11 +5 -3
xml-xindice/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java
Index: EntityReferenceImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/dom/EntityReferenceImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- EntityReferenceImpl.java 9 Aug 2003 21:19:52 -0000 1.10
+++ EntityReferenceImpl.java 12 Aug 2003 02:57:29 -0000 1.11
@@ -157,7 +157,9 @@
}
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.14 +11 -5
xml-xindice/java/src/org/apache/xindice/core/filer/FSFiler.java
Index: FSFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/FSFiler.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FSFiler.java 9 Aug 2003 18:56:18 -0000 1.13
+++ FSFiler.java 12 Aug 2003 02:57:29 -0000 1.14
@@ -199,7 +199,9 @@
return new Record(key, new Value(valueData), meta);
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
} finally {
locks.releaseSharedLock(file);
}
@@ -229,7 +231,9 @@
fos.close();
return true;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
} finally {
locks.releaseExclusiveLock(file);
}
@@ -253,7 +257,9 @@
locks.acquireExclusiveLock(file);
return file.delete();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
} finally {
locks.releaseExclusiveLock(file);
}
1.19 +5 -3
xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java
Index: BTree.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTree.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- BTree.java 9 Aug 2003 21:19:53 -0000 1.18
+++ BTree.java 12 Aug 2003 02:57:29 -0000 1.19
@@ -154,7 +154,9 @@
close();
return true;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
return false;
1.17 +14 -6
xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java
Index: HashFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/HashFiler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- HashFiler.java 9 Aug 2003 18:56:18 -0000 1.16
+++ HashFiler.java 12 Aug 2003 02:57:29 -0000 1.17
@@ -207,7 +207,9 @@
return new Record(key, v, meta);
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return null;
}
@@ -244,7 +246,9 @@
flush();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return true;
}
@@ -295,7 +299,9 @@
return true;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return false;
}
@@ -339,7 +345,9 @@
enum = keys.iterator();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.17 +14 -6
xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java
Index: BTreeFiler.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/filer/BTreeFiler.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- BTreeFiler.java 9 Aug 2003 21:19:53 -0000 1.16
+++ BTreeFiler.java 12 Aug 2003 02:57:29 -0000 1.17
@@ -158,7 +158,9 @@
} catch (BTreeException e) {
throw e;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return null;
}
@@ -199,7 +201,9 @@
} catch (IOException e) {
throw new FilerException(FaultCodes.DBE_CANNOT_CREATE,
e.getMessage(), e);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return true;
}
@@ -222,11 +226,15 @@
return true;
} catch (BTreeNotFoundException e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
} catch (BTreeException e) {
throw e;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return false;
}
1.12 +5 -3
xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateQueryResolver.java
Index: XUpdateQueryResolver.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/xupdate/XUpdateQueryResolver.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- XUpdateQueryResolver.java 7 Aug 2003 20:13:23 -0000 1.11
+++ XUpdateQueryResolver.java 12 Aug 2003 02:57:30 -0000 1.12
@@ -184,7 +184,9 @@
context.setDocument(keys[i], doc);
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
} else {
xu.execute(context);
1.9 +5 -3
xml-xindice/java/src/org/apache/xindice/xml/jaxp/DocumentBuilderImpl.java
Index: DocumentBuilderImpl.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/jaxp/DocumentBuilderImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DocumentBuilderImpl.java 9 Aug 2003 05:01:56 -0000 1.8
+++ DocumentBuilderImpl.java 12 Aug 2003 02:57:30 -0000 1.9
@@ -94,7 +94,9 @@
try {
parser = new DOMParser();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.18 +5 -3
xml-xindice/java/src/org/apache/xindice/core/CollectionManager.java
Index: CollectionManager.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/CollectionManager.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- CollectionManager.java 9 Aug 2003 18:56:19 -0000 1.17
+++ CollectionManager.java 12 Aug 2003 02:57:30 -0000 1.18
@@ -215,7 +215,9 @@
cfg.delete();
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
});
1.29 +11 -5
xml-xindice/java/src/org/apache/xindice/core/Database.java
Index: Database.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/Database.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Database.java 9 Aug 2003 21:19:53 -0000 1.28
+++ Database.java 12 Aug 2003 02:57:30 -0000 1.29
@@ -315,7 +315,9 @@
this.engine.setConfig(queryCfg);
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
if (!sysInit) {
@@ -324,7 +326,9 @@
try {
this.systemCollection.init();
} catch (XindiceException e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
super.addCollection(systemCollection);
@@ -347,7 +351,9 @@
super.setConfig(new Configuration(colDoc.getDocumentElement(),
false));
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
// Register the Database with the VM
1.34 +17 -7
xml-xindice/java/src/org/apache/xindice/core/Collection.java
Index: Collection.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/Collection.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Collection.java 9 Aug 2003 21:19:53 -0000 1.33
+++ Collection.java 12 Aug 2003 02:57:30 -0000 1.34
@@ -138,7 +138,9 @@
host_id += (b[3] << 24);
host_id = Math.abs(host_id);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -212,7 +214,9 @@
} else
return new ColContainer(key,
DOMParser.toDocument(val));
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
}
@@ -372,7 +376,9 @@
try {
close();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -873,7 +879,9 @@
obj.streamFromXML(doc.getDocumentElement());
return obj;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
}
@@ -1473,7 +1481,9 @@
Configuration idxConfig = config.getChild(INDEXES, true);
indexManager.setConfig(idxConfig);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.21 +32 -13
xml-xindice/java/src/org/apache/xindice/core/indexer/IndexManager.java
Index: IndexManager.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/IndexManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- IndexManager.java 9 Aug 2003 21:19:52 -0000 1.20
+++ IndexManager.java 12 Aug 2003 02:57:30 -0000 1.21
@@ -133,7 +133,9 @@
try {
symbols = collection.getSymbols();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -147,7 +149,9 @@
try {
register(Class.forName(className), cfg);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
});
@@ -185,7 +189,9 @@
cfg.delete();
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
});
@@ -194,7 +200,9 @@
try {
res = idx.drop();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return res;
}
@@ -321,7 +329,9 @@
list[i].indexer.open();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -338,7 +348,9 @@
try {
new SAXHandler(key, doc, ACTION_CREATE, list);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -346,7 +358,9 @@
try {
list[i].indexer.flush();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
list[i].status = STATUS_READY;
}
@@ -494,7 +508,9 @@
}
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -551,7 +567,9 @@
}
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
}
@@ -634,8 +652,9 @@
try {
mgr.populateNewIndexers();
} catch (DBException e) {
- log.warn(e);
-
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
}
1.12 +11 -5
xml-xindice/java/src/org/apache/xindice/core/indexer/NameIndexer.java
Index: NameIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/NameIndexer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- NameIndexer.java 7 Aug 2003 20:13:21 -0000 1.11
+++ NameIndexer.java 12 Aug 2003 02:57:30 -0000 1.12
@@ -122,7 +122,9 @@
setLocation(name);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -143,7 +145,9 @@
this.collection = collection;
symbols = collection.getSymbols();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -189,7 +193,9 @@
} catch (DBException e) {
throw e;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return (IndexMatch[]) results.toArray(EmptyMatches);
1.15 +20 -8
xml-xindice/java/src/org/apache/xindice/core/indexer/ValueIndexer.java
Index: ValueIndexer.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/indexer/ValueIndexer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ValueIndexer.java 9 Aug 2003 21:19:52 -0000 1.14
+++ ValueIndexer.java 12 Aug 2003 02:57:30 -0000 1.15
@@ -184,7 +184,9 @@
setLocation(name);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -205,7 +207,9 @@
this.collection = collection;
symbols = collection.getSymbols();
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -350,7 +354,9 @@
} catch (DBException e) {
throw e;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -376,7 +382,9 @@
} catch (IOException e) {
throw new BTreeCorruptException("Corruption detected on add", e);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -416,7 +424,9 @@
}
return true;
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return true;
}
@@ -424,7 +434,9 @@
} catch (IOException e) {
throw new BTreeCorruptException("Corruption detected on query",
e);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return (IndexMatch[]) results.toArray(EmptyMatches);
1.4 +5 -3
xml-xindice/java/src/org/apache/xindice/tools/command/XUpdate.java
Index: XUpdate.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/XUpdate.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XUpdate.java 7 Aug 2003 20:13:24 -0000 1.3
+++ XUpdate.java 12 Aug 2003 02:57:30 -0000 1.4
@@ -145,7 +145,9 @@
} catch (Exception e) {
System.out.println("ERROR : " + e.getMessage());
if (table.get(XMLTools.VERBOSE).equals("true")) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return false;
1.11 +5 -3
xml-xindice/java/src/org/apache/xindice/tools/command/XPathQuery.java
Index: XPathQuery.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/tools/command/XPathQuery.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XPathQuery.java 7 Aug 2003 20:13:24 -0000 1.10
+++ XPathQuery.java 12 Aug 2003 02:57:30 -0000 1.11
@@ -125,7 +125,9 @@
} catch (Exception e) {
System.out.println("ERROR : " + e.getMessage());
if (table.get(XMLTools.VERBOSE).equals("true")) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return false;
1.14 +8 -4
xml-xindice/java/src/org/apache/xindice/util/Configuration.java
Index: Configuration.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/util/Configuration.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Configuration.java 9 Aug 2003 05:01:55 -0000 1.13
+++ Configuration.java 12 Aug 2003 02:57:30 -0000 1.14
@@ -671,7 +671,9 @@
}
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -701,7 +703,9 @@
}
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
1.18 +8 -4
xml-xindice/java/src/org/apache/xindice/core/request/URIMapper.java
Index: URIMapper.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/request/URIMapper.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- URIMapper.java 9 Aug 2003 21:19:53 -0000 1.17
+++ URIMapper.java 12 Aug 2003 02:57:30 -0000 1.18
@@ -128,7 +128,9 @@
setURI(u.toString());
} catch (Exception e) {
// Put error code here!
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -176,7 +178,9 @@
throw new Exception("Content type unsupported");
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
// Inputstream already initialized, set output to be value of
urlresult
1.22 +8 -6
xml-xindice/java/src/org/apache/xindice/server/XindiceServlet.java
Index: XindiceServlet.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/server/XindiceServlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- XindiceServlet.java 9 Aug 2003 21:19:53 -0000 1.21
+++ XindiceServlet.java 12 Aug 2003 02:57:30 -0000 1.22
@@ -246,12 +246,14 @@
log.info("Database successfully started");
} catch (RuntimeException e) {
-
- log.fatal(e);
+ if (log.isFatalEnabled()) {
+ log.fatal("ignored exception", e);
+ }
throw new ServletException("Error while handling the
configuration", e);
} catch (Exception e) {
-
- log.fatal(e);
+ if (log.isFatalEnabled()) {
+ log.fatal("ignored exception", e);
+ }
throw new ServletException("Error while handling the
configuration", e);
}
}
1.10 +5 -3
xml-xindice/java/src/org/apache/xindice/core/query/QueryEngine.java
Index: QueryEngine.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/QueryEngine.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- QueryEngine.java 9 Aug 2003 21:19:53 -0000 1.9
+++ QueryEngine.java 12 Aug 2003 02:57:30 -0000 1.10
@@ -116,7 +116,9 @@
res.setQueryEngine(QueryEngine.this);
resolvers.put(res.getQueryStyle(), res);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
});
1.23 +8 -4
xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java
Index: XPathQueryResolver.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/query/XPathQueryResolver.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XPathQueryResolver.java 9 Aug 2003 21:19:53 -0000 1.22
+++ XPathQueryResolver.java 12 Aug 2003 02:57:30 -0000 1.23
@@ -266,7 +266,9 @@
keySet = ((NamedKeys) obj).keys;
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
@@ -972,7 +974,9 @@
idxMgr.create(new Configuration(e));
}
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
return null;
}
1.14 +6 -4
xml-xindice/java/src/org/apache/xindice/xml/TextWriter.java
Index: TextWriter.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/xml/TextWriter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TextWriter.java 9 Aug 2003 21:19:52 -0000 1.13
+++ TextWriter.java 12 Aug 2003 02:57:30 -0000 1.14
@@ -293,7 +293,7 @@
buf.flush();
} catch (Exception e) {
if (log.isWarnEnabled()) {
- log.warn(e);
+ log.warn("ignored exception", e);
}
}
}
@@ -309,7 +309,9 @@
OutputStreamWriter o = new OutputStreamWriter(output, "utf-8");
write(node, o);
} catch (Exception e) {
- log.warn(e);
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
}
}
