lukasz-antoniak

Atomix atomix = new Atomix("atomix.conf");
atomix.start().join();
AtomicMap<String, String> map = atomix.atomicMapBuilder("my-map").build();
map.put("foo", "Hello world!");
Versioned<String> value = map.get("foo");
while (!map.put("foo", "Hello world again!", value.version())) {
    Thread.sleep(10);
}
map.close();
atomix.stop();

lukasz-antoniak

@Test
public void testChildSessionTransactionCompletionProcess() {
	Session session = openSession();
	session.getTransaction().begin();

	// Open secondary session.
	Session secondarySession = session.sessionWithOptions().transactionContext().autoClose( false )
			.connectionReleaseMode( ConnectionReleaseMode.AFTER_TRANSACTION )
			.openSession();

lukasz-antoniak

diff --git a/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/delete/CompositeKeyJoinColumnTest.java b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/delete/CompositeKeyJoinColumnTest.java
new file mode 100644
index 0000000..17dd6b3
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/test/annotations/cascade/delete/CompositeKeyJoinColumnTest.java
@@ -0,0 +1,50 @@
+package org.hibernate.test.annotations.cascade.delete;
+
+import org.hibernate.Session;
+

lukasz-antoniak

diff --git a/hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java b/hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java
index 215c088..1a6a535 100644
--- a/hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java
+++ b/hibernate-core/src/test/java/org/hibernate/test/onetoone/nopojo/DynamicMapOneToOneTest.java
@@ -22,7 +22,7 @@ import static org.junit.Assert.assertNotNull;
 public class DynamicMapOneToOneTest extends BaseCoreFunctionalTestCase {
        @Override
        public String[] getMappings() {
-               return new String[] { "onetoone/nopojo/Person.hbm.xml" };
+               return new String[] { "onetoone/nopojo/Person.hbm.xml", "onetoone/nopojo/Marriage.hbm.xml" };

lukasz-antoniak

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
index a2c848b..082f05c 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/JdbcCoordinatorImpl.java
@@ -370,14 +370,15 @@ public class JdbcCoordinatorImpl implements JdbcCoordinator {
 	}
 
 	@Override
-	public void register(ResultSet resultSet) {
+	public void register(ResultSet resultSet, Statement statement) {

lukasz-antoniak

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
index f4c943c..45edd1e 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/spi/ActionQueue.java
@@ -32,7 +32,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Queue;
 import java.util.Set;

lukasz-antoniak

<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <groupId>voldemort</groupId>
    <artifactId>voldemort</artifactId>
    <version>0.96</version>
    <url>http://www.project-voldemort.com</url>
    <description>Voldemort Maven descriptor</description>
    <dependencies>