You are viewing a plain text version of this content. The canonical link for it is here.
Posted to xindice-dev@xml.apache.org by vl...@apache.org on 2002/11/19 06:16:58 UTC
cvs commit: xml-xindice/java/src/org/apache/xindice/core/request URIMapper.java
vladimir 2002/11/18 21:16:58
Modified: java/src/org/apache/xindice/core/filer BTreeFiler.java
java/src/org/apache/xindice/core/indexer IndexManager.java
NameIndexer.java ValueIndexer.java
java/src/org/apache/xindice/core/request URIMapper.java
Log:
minor fix for the Exception
Revision Changes Path
1.8 +10 -10 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- BTreeFiler.java 31 Oct 2002 06:59:57 -0000 1.7
+++ BTreeFiler.java 19 Nov 2002 05:16:58 -0000 1.8
@@ -150,10 +150,10 @@
return new Record(key, v, meta);
}
- catch ( BTreeNotFoundException b ) {
+ catch ( BTreeNotFoundException e ) {
}
- catch ( BTreeException b ) {
- throw b;
+ catch ( BTreeException e ) {
+ throw e;
}
catch ( Exception e ) {
if (log.isDebugEnabled()) {
@@ -177,7 +177,7 @@
long pos = findValue(key);
p = getPage(pos);
}
- catch ( BTreeNotFoundException b ) {
+ catch ( BTreeNotFoundException e ) {
p = getFreePage();
addValue(key, p.getPageNum());
fileHeader.incRecordCount();
@@ -195,8 +195,8 @@
flush();
}
- catch ( DBException d ) {
- throw d;
+ catch ( DBException e ) {
+ throw e;
}
catch ( IOException e ) {
throw new FilerException(FaultCodes.DBE_CANNOT_CREATE, e.getMessage(), e);
@@ -227,10 +227,10 @@
return true;
}
- catch ( BTreeNotFoundException b ) {
+ catch ( BTreeNotFoundException e ) {
}
- catch ( BTreeException b ) {
- throw b;
+ catch ( BTreeException e ) {
+ throw e;
}
catch ( Exception e ) {
if (log.isDebugEnabled()) {
1.10 +5 -5 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- IndexManager.java 4 Nov 2002 06:39:55 -0000 1.9
+++ IndexManager.java 19 Nov 2002 05:16:58 -0000 1.10
@@ -237,8 +237,8 @@
return idx;
}
- catch ( DBException d ) {
- throw d;
+ catch ( DBException e ) {
+ throw e;
}
catch ( Exception e ) {
throw new CannotCreateException("Cannot create Index", e);
@@ -284,8 +284,8 @@
return idx;
}
- catch ( DBException d ) {
- throw d;
+ catch ( DBException e ) {
+ throw e;
}
catch ( Exception e ) {
throw new CannotCreateException("Cannot create Index '"+name+"'", e);
1.7 +3 -3 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NameIndexer.java 31 Oct 2002 07:16:52 -0000 1.6
+++ NameIndexer.java 19 Nov 2002 05:16:58 -0000 1.7
@@ -194,8 +194,8 @@
}
});
}
- catch ( DBException d ) {
- throw d;
+ catch ( DBException e ) {
+ throw e;
}
catch ( Exception e ) {
if (log.isDebugEnabled()) {
1.6 +5 -5 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValueIndexer.java 31 Oct 2002 07:16:52 -0000 1.5
+++ ValueIndexer.java 19 Nov 2002 05:16:58 -0000 1.6
@@ -336,8 +336,8 @@
Value cv = getCombinedValue(key, pos, len, elemID, attrID);
removeValue(root, cv);
}
- catch ( DBException d ) {
- throw d;
+ catch ( DBException e ) {
+ throw e;
}
catch ( Exception e ) {
if (log.isDebugEnabled()) {
@@ -364,8 +364,8 @@
Value cv = getCombinedValue(key, pos, len, elemID, attrID);
addValue(root, cv, MATCH_INFO);
}
- catch ( DBException d ) {
- throw d;
+ catch ( DBException e ) {
+ throw e;
}
catch ( IOException e ) {
throw new BTreeCorruptException("Corruption detected on add", e);
1.9 +2 -2 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- URIMapper.java 31 Oct 2002 07:16:52 -0000 1.8
+++ URIMapper.java 19 Nov 2002 05:16:58 -0000 1.9
@@ -230,7 +230,7 @@
try {
this.getInputStream();
}
- catch ( IOException ex ) {
+ catch ( IOException e ) {
return 0;
}
}