Author: jmitchell
Date: Sat Apr 23 19:37:56 2005
New Revision: 164440
URL: http://svn.apache.org/viewcvs?rev=164440&view=rev
Log:
add a check that tells if this instance is currently open (initialized, loaded,
etc)
Modified:
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
Modified:
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java?rev=164440&r1=164439&r2=164440&view=diff
==============================================================================
---
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
(original)
+++
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/UserDatabase.java
Sat Apr 23 19:37:56 2005
@@ -72,6 +72,14 @@
/**
+ * <p>Return true if open() has been called.</p>
+ *
+ * @exception Exception if a database access error occurs
+ */
+ public boolean isOpen();
+
+
+ /**
* <p>Initiate access to the underlying persistence layer.</p>
*
* @exception Exception if a database access error occurs
Modified:
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
URL:
http://svn.apache.org/viewcvs/struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java?rev=164440&r1=164439&r2=164440&view=diff
==============================================================================
---
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
(original)
+++
struts/apps/trunk/dao/src/java/org/apache/struts/apps/mailreader/dao/impl/memory/MemoryUserDatabase.java
Sat Apr 23 19:37:56 2005
@@ -31,7 +31,6 @@
import org.apache.commons.digester.ObjectCreationFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.apps.mailreader.dao.ExpiredPasswordException;
import org.apache.struts.apps.mailreader.dao.Subscription;
import org.apache.struts.apps.mailreader.dao.User;
import org.apache.struts.apps.mailreader.dao.UserDatabase;
@@ -65,7 +64,9 @@
* The [EMAIL PROTECTED] User}s associated with this UserDatabase, keyed
by username.
*/
private HashMap users = new HashMap();
-
+
+ private boolean open = false;
+
// ------------------------------------------------------------- Properties
@@ -98,6 +99,7 @@
public void close() throws Exception {
save();
+ this.open = false;
}
@@ -124,7 +126,7 @@
// See interface for Javadoc
- public User findUser(String username) throws ExpiredPasswordException {
+ public User findUser(String username) {
synchronized (users) {
return ((User) users.get(username));
@@ -175,6 +177,7 @@
bis.close();
bis = null;
fis = null;
+ this.open = true;
} catch (Exception e) {
@@ -296,6 +299,12 @@
fileOld.delete();
}
+
+ public boolean isOpen() {
+ return this.open;
+ }
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
