Projects >> Kundera >>8f4f1c5e6061afc1f70f81652c4fff27d493c8d1

Chunk
Conflicting content 
        PersistenceUnitMetadata puMetadata = KunderaMetadataManager.getPersistenceUnitMetadata(pu);
        Properties properties = new Properties();
<<<<<<< HEAD
=======
        InputStream inStream = ClassLoader.getSystemResourceAsStream(KUNDERA_CASSANDRA_PROPERTIES);
>>>>>>> 10c5fb95b15840323f39cb1871c779b244d910ea
        try
        {
            InputStream inStream = puMetadata != null ? ClassLoader.getSystemResourceAsStream(puMetadata
Solution content 
        PersistenceUnitMetadata puMetadata = KunderaMetadataManager.getPersistenceUnitMetadata(pu);
        Properties properties = new Properties();
        try
        {
            InputStream inStream = puMetadata != null ? ClassLoader.getSystemResourceAsStream(puMetadata
File
CassandraPropertiesTest.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Variable
Chunk
Conflicting content 
        props.put(PersistenceProperties.KUNDERA_PORT, "9160");
        props.put(PersistenceProperties.KUNDERA_KEYSPACE, keyspace);
        props.put(PersistenceProperties.KUNDERA_DDL_AUTO_PREPARE, property);
<<<<<<< HEAD
        props.put(PersistenceProperties.KUNDERA_CLIENT_PROPERTY, "kundera-cassandra.properties");
=======
        props.put(PersistenceProperties.KUNDERA_CLIENT_PROPERTY, KUNDERA_CASSANDRA_PROPERTIES);
        
>>>>>>> 10c5fb95b15840323f39cb1871c779b244d910ea
        if (useLucene)
        {
            props.put(PersistenceProperties.KUNDERA_INDEX_HOME_DIR, HOME_IMPADMIN_LUCENE);
Solution content 
        props.put(PersistenceProperties.KUNDERA_PORT, "9160");
        props.put(PersistenceProperties.KUNDERA_KEYSPACE, keyspace);
        props.put(PersistenceProperties.KUNDERA_DDL_AUTO_PREPARE, property);

        props.put(PersistenceProperties.KUNDERA_CLIENT_PROPERTY, KUNDERA_CASSANDRA_PROPERTIES);
        

        if (useLucene)
        {
            props.put(PersistenceProperties.KUNDERA_INDEX_HOME_DIR, HOME_IMPADMIN_LUCENE);
File
CassandraPropertiesTest.java
Developer's decision
Version 2
Kind of conflict
Method invocation