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 vg...@apache.org on 2004/02/21 04:56:11 UTC
cvs commit: xml-xindice/java/src/org/apache/xindice/util Disposable.java
vgritsenko 2004/02/20 19:56:11
Modified: java/src/org/apache/xindice/core Collection.java
CollectionManager.java
Removed: java/src/org/apache/xindice/util Disposable.java
Log:
Add CollectionManager.close()
Remove Disposable interface (not used)
Revision Changes Path
1.50 +2 -15 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- Collection.java 21 Feb 2004 02:11:23 -0000 1.49
+++ Collection.java 21 Feb 2004 03:56:11 -0000 1.50
@@ -331,19 +331,6 @@
}
/**
- * @see org.apache.xindice.util.Disposable#dispose()
- */
- public void dispose() {
- try {
- close();
- } catch (Exception e) {
- if (log.isWarnEnabled()) {
- log.warn("ignored exception", e);
- }
- }
- }
-
- /**
* @see org.apache.xindice.core.DBObject#drop()
*/
public boolean drop() throws DBException {
1.26 +17 -8 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- CollectionManager.java 8 Feb 2004 02:51:06 -0000 1.25
+++ CollectionManager.java 21 Feb 2004 03:56:11 -0000 1.26
@@ -23,19 +23,19 @@
import org.apache.xindice.util.Configurable;
import org.apache.xindice.util.Configuration;
import org.apache.xindice.util.ConfigurationCallback;
-import org.apache.xindice.util.Disposable;
import org.apache.xindice.util.XindiceException;
import java.util.HashMap;
import java.util.Map;
import java.util.StringTokenizer;
+import java.util.Iterator;
/**
* CollectionManager is the base class for both Database and Collection.
*
* @version CVS $Revision$, $Date$
*/
-public class CollectionManager implements Configurable, Disposable {
+public class CollectionManager implements Configurable {
private static final Log log = LogFactory.getLog(CollectionManager.class);
@@ -144,10 +144,19 @@
return collection;
}
- /**
- * @see org.apache.xindice.util.Disposable#dispose()
- */
- public void dispose() {
+ public boolean close() throws DBException {
+ for(Iterator i = collections.values().iterator(); i.hasNext(); ) {
+ Collection collection = (Collection)i.next();
+ try {
+ collection.close();
+ } catch (DBException e) {
+ if (log.isWarnEnabled()) {
+ log.warn("ignored exception", e);
+ }
+ }
+ }
+
+ return true;
}
/**