Update of /var/cvs/src/org/mmbase/bridge/implementation
In directory james.mmbase.org:/tmp/cvs-serv21359
Modified Files:
BasicCloud.java
Log Message:
a bit code to correct an inconsistency which can sometimes occur because of
exceptions or so
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/bridge/implementation
Index: BasicCloud.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/bridge/implementation/BasicCloud.java,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -b -r1.194 -r1.195
--- BasicCloud.java 19 Nov 2008 18:01:06 -0000 1.194
+++ BasicCloud.java 19 Nov 2008 18:04:23 -0000 1.195
@@ -29,7 +29,7 @@
* @author Rob Vermeulen
* @author Pierre van Rooden
* @author Michiel Meeuwissen
- * @version $Id: BasicCloud.java,v 1.194 2008/11/19 18:01:06 michiel Exp $
+ * @version $Id: BasicCloud.java,v 1.195 2008/11/19 18:04:23 michiel Exp $
*/
public class BasicCloud implements Cloud, Cloneable, Comparable<Cloud>,
SizeMeasurable, Serializable {
@@ -60,7 +60,7 @@
protected String description = null;
// all transactions started by this cloud object (with createTransaction)
- protected Map<String, Transaction> transactions = new HashMap<String,
Transaction>();
+ protected Map<String, BasicTransaction> transactions = new HashMap<String,
BasicTransaction>();
// node managers cache
protected Map<String, BasicNodeManager> nodeManagerCache = new
HashMap<String, BasicNodeManager>();
@@ -533,7 +533,7 @@
return createTransaction(name, false);
}
- public Transaction createTransaction(String name, boolean overwrite)
throws AlreadyExistsException {
+ public BasicTransaction createTransaction(String name, boolean overwrite)
throws AlreadyExistsException {
if (name == null) {
name = "Tran" + uniqueId();
} else {
@@ -546,7 +546,7 @@
}
}
}
- Transaction transaction = new BasicTransaction(name, this);
+ BasicTransaction transaction = new BasicTransaction(name, this);
transactions.put(name, transaction);
return transaction;
}
@@ -1054,7 +1054,7 @@
locale = (Locale) in.readObject();
log.info("Reading " + this);
org.mmbase.util.ThreadPools.jobsExecutor.execute(new
BasicCloudStarter());
- transactions = new HashMap<String, Transaction>();
+ transactions = new HashMap<String, BasicTransaction>();
nodeManagerCache = new HashMap<String, BasicNodeManager>();
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs