Projects >> Kundera >>728900a0968095e3e503a5da03155ae865225f71

Chunk
Conflicting content
    public HibernateClient(final String persistenceUnit, IndexManager indexManager, EntityReader reader,
            SessionFactory sf, Map puProperties)
    {
<<<<<<< HEAD
        conf = new Configuration().addProperties(HibernateUtils.getProperties(persistenceUnit));
        Collection> classes = ((MetamodelImpl) KunderaMetadata.INSTANCE.getApplicationMetadata().getMetamodel(
                persistenceUnit)).getEntityNameToClassMap().values();
        // to keep hibernate happy! As in our case all scanned classes are not
        // meant for rdbms, so initally i have set depth to zero!
        conf.setProperty("hibernate.max_fetch_depth", "0");             

        serviceRegistry = new ServiceRegistryBuilder().applySettings(conf.getProperties()).buildServiceRegistry();
        // / sessionFactory =
        // configuration.buildSessionFactory(serviceRegistry);
        for (Class c : classes)
        {
            conf.addAnnotatedClass(c);
        }
        sf = conf.buildSessionFactory(serviceRegistry);

=======
        this.sf = sf;
>>>>>>> 7e448301292588cb69dbb28cf82642a15c431c96
        // TODO . once we clear this persistenceUnit stuff we need to simply
        // modify this to have a properties or even pass an EMF!
        this.persistenceUnit = persistenceUnit;
Solution content
    public HibernateClient(final String persistenceUnit, IndexManager indexManager, EntityReader reader,
            SessionFactory sf, Map puProperties)
    {

        this.sf = sf;
        // TODO . once we clear this persistenceUnit stuff we need to simply
        // modify this to have a properties or even pass an EMF!
        this.persistenceUnit = persistenceUnit;
File
HibernateClient.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
For statement
Method invocation
Variable