aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/java/sip/communicator/impl
diff options
context:
space:
mode:
authorDamian Minkov <damencho@jitsi.org>2006-07-03 11:54:19 +0000
committerDamian Minkov <damencho@jitsi.org>2006-07-03 11:54:19 +0000
commit8f0d459007e591e5bc30a2e4a3c3b3c5deb95218 (patch)
treec4379f122f83864358e0c1eb3463cf06e11bc992 /src/net/java/sip/communicator/impl
parentcb69a565837d2cef3472675d366fbe9991d5bd8a (diff)
downloadjitsi-8f0d459007e591e5bc30a2e4a3c3b3c5deb95218.zip
jitsi-8f0d459007e591e5bc30a2e4a3c3b3c5deb95218.tar.gz
jitsi-8f0d459007e591e5bc30a2e4a3c3b3c5deb95218.tar.bz2
fixed end of the recursion when reading db structure files
Diffstat (limited to 'src/net/java/sip/communicator/impl')
-rw-r--r--src/net/java/sip/communicator/impl/history/DBStructSerializer.java15
1 files changed, 10 insertions, 5 deletions
diff --git a/src/net/java/sip/communicator/impl/history/DBStructSerializer.java b/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
index 0ed7ee8..41bafb5 100644
--- a/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
+++ b/src/net/java/sip/communicator/impl/history/DBStructSerializer.java
@@ -25,7 +25,7 @@ import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
/**
- *
+ *
* @author Alexander Pelov
*/
public class DBStructSerializer {
@@ -91,14 +91,14 @@ public class DBStructSerializer {
* the information from it. The parsing is non-validating, so if a malformed
* XML is passed the results are undefined. The file should be with the
* following structure:
- *
+ *
* <dbstruct version="1.0"> <id value="idcomponent1"> <id
* value="idcomponent2"> <id value="idcomponent3"/> </id> </id>
- *
+ *
* <structure> <property name="propertyName" type="textType" /> <property
* name="propertyName" type="textType" /> <property name="propertyName"
* type="textType" /> </structure> </dbstruct>
- *
+ *
* @param dbDatFile
* The file to be parsed.
* @return A History object corresponding to this dbstruct file.
@@ -125,7 +125,7 @@ public class DBStructSerializer {
/**
* This method parses a "structure" tag and returns the corresponging
* HistoryRecordStructure.
- *
+ *
* @throws ParseException
* Thrown if there is no structure tag.
*/
@@ -184,6 +184,11 @@ public class DBStructSerializer {
"There is an ID object without value.", 0);
}
}
+ else
+ {
+ // no more nodes
+ return loadedIDs;
+ }
return loadID(loadedIDs, node);
}