| commit | 56c3a57186ab778e731c4117ac839b74eed59749 | [log] [tgz] |
|---|---|---|
| author | Philippe Van Dyck <pvdyck@gmail.com> | Thu Nov 18 12:36:29 2010 +0100 |
| committer | Philippe Van Dyck <pvdyck@gmail.com> | Thu Nov 18 12:36:29 2010 +0100 |
| tree | 9e6f674ff7b218eb26ceb3df4bb0f68035fffe69 | |
| parent | 3e8a4619d5d374797ee451f721ced0a6137fcf38 [diff] | |
| parent | 8fa1b71aa06a70105554237a8b898b0808f0d3d8 [diff] |
Merge branch 'master' of github.com:Qi4j/qi4j-sandbox
diff --git a/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java b/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java index 3b0783f..27c7e67 100644 --- a/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java +++ b/extensions/entitystore-cassandra/src/main/java/org/qi4j/entitystore/cassandra/CassandraMapEntityStoreMixin.java
@@ -1,7 +1,6 @@ package org.qi4j.entitystore.cassandra; import org.apache.cassandra.thrift.*; -import org.apache.commons.lang.NotImplementedException; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransport; @@ -115,7 +114,7 @@ } public Input<Reader, IOException> entityStates() { - throw new NotImplementedException(); + throw new UnsupportedOperationException("Not implemented yet"); }
diff --git a/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java b/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java index dc53472..5fba734 100644 --- a/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java +++ b/libraries/jini/importer/src/main/java/org/qi4j/library/jini/importer/JiniImporter.java
@@ -61,4 +61,10 @@ JiniProxyHandler jiniHandler = (JiniProxyHandler) Proxy.getInvocationHandler( instance ); return jiniHandler.isActive(); } + + public boolean isAvailable( Object instance ) + { + JiniProxyHandler jiniHandler = (JiniProxyHandler) Proxy.getInvocationHandler( instance ); + return jiniHandler.isActive(); + } }