Author: toad
Date: 2008-12-16 22:04:56 +0000 (Tue, 16 Dec 2008)
New Revision: 24389
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/Db4oVersion.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/foundation/Iterators.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ClassMetadataRepository.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ObjectReference.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/PartialObjectContainer.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/activation/LegacyActivationDepth.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionHandle.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionPool.java
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ObjectServerImpl.java
Log:
Update db4o to 7.4.71.12224
Modified: trunk/contrib/db4o/src/db4oj/core/src/com/db4o/Db4oVersion.java
===================================================================
--- trunk/contrib/db4o/src/db4oj/core/src/com/db4o/Db4oVersion.java
2008-12-16 20:13:09 UTC (rev 24388)
+++ trunk/contrib/db4o/src/db4oj/core/src/com/db4o/Db4oVersion.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -24,9 +24,9 @@
* @exclude
*/
public class Db4oVersion {
- public static final String NAME = "7.4.63.11890";
+ public static final String NAME = "7.4.71.12224";
public static final int MAJOR = 7;
public static final int MINOR = 4;
- public static final int ITERATION = 63;
- public static final int REVISION = 11890;
+ public static final int ITERATION = 71;
+ public static final int REVISION = 12224;
}
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/foundation/Iterators.java
===================================================================
--- trunk/contrib/db4o/src/db4oj/core/src/com/db4o/foundation/Iterators.java
2008-12-16 20:13:09 UTC (rev 24388)
+++ trunk/contrib/db4o/src/db4oj/core/src/com/db4o/foundation/Iterators.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -24,6 +24,8 @@
* Iterator primitives (concat, map, reduce, filter, etc...).
*
* @exclude
+ *
+ * @sharpen.partial
*/
public class Iterators {
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ClassMetadataRepository.java
===================================================================
---
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ClassMetadataRepository.java
2008-12-16 20:13:09 UTC (rev 24388)
+++
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ClassMetadataRepository.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -479,6 +479,14 @@
clazz.refresh();
}
}
+
+ public void checkAllClassChanges(){
+ Iterator4 i = _classMetadataByID.keys();
+ while(i.moveNext()){
+ int classMetadataID = ((Integer)i.current()).intValue();
+ getClassMetadata(classMetadataID);
+ }
+ }
public void refreshClass(ClassMetadata clazz) {
if (_classMetadataByID.get(clazz.getID()) == null) {
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ObjectReference.java
===================================================================
---
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ObjectReference.java
2008-12-16 20:13:09 UTC (rev 24388)
+++
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/ObjectReference.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -104,14 +104,19 @@
return;
}
_updateListener = new TransactionListener() {
+
+ private Object _hardRef = getObject();
+
public void postRollback() {
resetListener();
-
transparentPersistence.rollback(transaction.objectContainer(),
ObjectReference.this.getObject());
+
transparentPersistence.rollback(transaction.objectContainer(), _hardRef);
+ _hardRef = null;
}
public void preCommit() {
resetListener();
- container().store(transaction, getObject());
+ container().store(transaction, _hardRef);
+ _hardRef = null;
}
};
transaction.addTransactionListener(_updateListener);
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/PartialObjectContainer.java
===================================================================
---
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/PartialObjectContainer.java
2008-12-16 20:13:09 UTC (rev 24388)
+++
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/PartialObjectContainer.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -795,6 +795,12 @@
} catch(ArrayIndexOutOfBoundsException aiobe){
completeTopLevelCall(new InvalidIDException(aiobe));
} finally {
+
+ // Never shut down for getById()
+ // There may be OutOfMemoryErrors or similar
+ // The user may want to catch and continue working.
+ _topLevelCallCompleted = true;
+
endTopLevelCall();
}
// only to make the compiler happy
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/activation/LegacyActivationDepth.java
===================================================================
---
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/activation/LegacyActivationDepth.java
2008-12-16 20:13:09 UTC (rev 24388)
+++
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/activation/LegacyActivationDepth.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -42,7 +42,7 @@
public ActivationDepth descend(ClassMetadata metadata) {
if (null == metadata) {
- throw new ArgumentNullException();
+ return new LegacyActivationDepth(_depth -1 , _mode);
}
return new LegacyActivationDepth(descendDepth(metadata), _mode);
}
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionHandle.java
===================================================================
---
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionHandle.java
2008-12-16 20:13:09 UTC (rev 24388)
+++
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionHandle.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -51,6 +51,7 @@
public void close() {
if ((!_transactionPool.isClosed()) && (_mainTransaction !=
null)) {
+ _transactionPool.release(_mainTransaction, _rollbackOnClose);
_mainTransaction.close(_rollbackOnClose);
}
}
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionPool.java
===================================================================
---
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionPool.java
2008-12-16 20:13:09 UTC (rev 24388)
+++
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ClientTransactionPool.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -85,6 +85,9 @@
}
}
+ public int openTransactionCount(){
+ return isClosed() ? 0 : _transaction2Container.size();
+ }
public int openFileCount() {
return isClosed() ? 0 : _fileName2Container.size();
Modified:
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ObjectServerImpl.java
===================================================================
---
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ObjectServerImpl.java
2008-12-16 20:13:09 UTC (rev 24388)
+++
trunk/contrib/db4o/src/db4oj/core/src/com/db4o/internal/cs/ObjectServerImpl.java
2008-12-16 22:04:56 UTC (rev 24389)
@@ -77,6 +77,8 @@
_container.setServer(true);
configureObjectServer();
+ _container.classCollection().checkAllClassChanges();
+
boolean ok = false;
try {
ensureLoadStaticClass();
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
