Projects >> Kundera >>4e3464f2c85bdd03b28c116472ca77dbd12ff123

Chunk
Conflicting content 
        getIndexManager().remove(entityMetadata, entity, pKey.toString());
    }

<<<<<<< HEAD
    /**
     * @param idString
     * @return
     */
    private String getNextString(String idString)
    {
        char lastChar = (char) idString.charAt(idString.length() - 1);
        String idString2 = idString.substring(0, idString.length() - 1) + (char) ((int) lastChar + 1);
        return idString2;
    }
=======
>>>>>>> eb84e486618e57a216483e1f499fad314ae7382c

    /**
     * On persist.
Solution content 
        getIndexManager().remove(entityMetadata, entity, pKey.toString());
    }

    /**
     * @param idString
     * @return
     */
    private String getNextString(String idString)
    {
        char lastChar = (char) idString.charAt(idString.length() - 1);
        String idString2 = idString.substring(0, idString.length() - 1) + (char) ((int) lastChar + 1);
        return idString2;
    }

    /**
     * On persist.
File
OracleNoSQLClient.java
Developer's decision
Version 1
Kind of conflict
Comment
Method declaration
Chunk
Conflicting content 
        }
    }

<<<<<<< HEAD
    private void execute(List batch)
    {
        if (batch != null && !batch.isEmpty())
        {
            try
            {
                kvStore.execute(batch);
            }
            catch (DurabilityException e)
            {
                log.error(e);
                throw new PersistenceException("Error while Persisting data using batch", e);
            }
            catch (OperationExecutionException e)
            {
                log.error(e);
                throw new PersistenceException("Error while Persisting data using batch", e);
            }
            catch (FaultException e)
            {
                log.error(e);
                throw new PersistenceException("Error while Persisting data using batch", e);
            }
            finally
            {
                batch.clear();
            }
        }
    }
=======
    
>>>>>>> eb84e486618e57a216483e1f499fad314ae7382c

    @Override
    public  List findAll(Class entityClass, String[] columnsToSelect, Object... keys)
Solution content 
        }
    }

    private void execute(List batch)
    {
        if (batch != null && !batch.isEmpty())
        {
            try
            {
                kvStore.execute(batch);
            }
            catch (DurabilityException e)
            {
                log.error(e);
                throw new PersistenceException("Error while Persisting data using batch", e);
            }
            catch (OperationExecutionException e)
            {
                log.error(e);
                throw new PersistenceException("Error while Persisting data using batch", e);
            }
            catch (FaultException e)
            {
                log.error(e);
                throw new PersistenceException("Error while Persisting data using batch", e);
            }
            finally
            {
                batch.clear();
            }
        }
    }

    @Override
    public  List findAll(Class entityClass, String[] columnsToSelect, Object... keys)
File
OracleNoSQLClient.java
Developer's decision
Version 1
Kind of conflict
Method declaration