Projects >> graniteds >>26da9d2d7d6bb3ac09d3a0545a47b095d910efa4

Chunk
Conflicting content 
            // Get Proxy
            return (HibernateProxy)getProxy.invoke(null, new Object[]{factory, entityName, persistentClass, INTERFACES, identifierGetter, null, null, id, null});
<<<<<<< HEAD
        } catch (Exception e) {
=======
        } 
        catch (Exception e) {
>>>>>>> 5051be4ab02d6e040ab8855ae50c0d1ac9034e9f
            throw new ServiceException("Error with proxy description: " + persistentClassName + '/' + entityName + " and id: " + id, e);
        }
    }
Solution content 
            // Get Proxy
            return (HibernateProxy)getProxy.invoke(null, new Object[]{factory, entityName, persistentClass, INTERFACES, identifierGetter, null, null, id, null});
<<<<<<< HEAD
        } catch (Exception e) {
=======
        } 
        catch (Exception e) {
>>>>>>> enterprise
            throw new ServiceException("Error with proxy description: " + persistentClassName + '/' + entityName + " and id: " + id, e);
        }
    }
File
ProxyFactory.java
Developer's decision
Manual
Kind of conflict
Catch clause
Chunk
Conflicting content 
        }

        if (type == null) {
<<<<<<< HEAD
            PropertyDescriptor[] propertyDescriptors = Introspector.getPropertyDescriptors(persistentClass);

=======
            PropertyDescriptor[] propertyDescriptors = null;
            try {
                BeanInfo beanInfo = Introspector.getBeanInfo(persistentClass);
                propertyDescriptors = beanInfo.getPropertyDescriptors();
            } 
            catch (Exception e) {
                throw new IllegalArgumentException("Could not find id in: " + persistentClass, e);
            }
            
>>>>>>> 5051be4ab02d6e040ab8855ae50c0d1ac9034e9f
            for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
                Method method = propertyDescriptor.getReadMethod();
                if (method != null && (
Solution content 
        }

        if (type == null) {
            PropertyDescriptor[] propertyDescriptors = Introspector.getPropertyDescriptors(persistentClass);

            for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
                Method method = propertyDescriptor.getReadMethod();
                if (method != null && (
File
ProxyFactory.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
                	factory, entityName, persistentClass, INTERFACES, null, null, null, id, null, overridesEquals(persistentClass)});
            }
            return (HibernateProxy)getProxy.invoke(null, new Object[]{factory, entityName, persistentClass, INTERFACES, identifierGetter, null, null, id, null});
<<<<<<< HEAD
        } catch (Exception e) {
=======
        } 
        catch (Exception e) {
>>>>>>> 5051be4ab02d6e040ab8855ae50c0d1ac9034e9f
            throw new ServiceException("Error with proxy description: " + persistentClassName + '/' + entityName + " and id: " + id, e);
        }
    }
Solution content 
                	factory, entityName, persistentClass, INTERFACES, null, null, null, id, null, overridesEquals(persistentClass)});
            }
            return (HibernateProxy)getProxy.invoke(null, new Object[]{factory, entityName, persistentClass, INTERFACES, identifierGetter, null, null, id, null});
        } 
        catch (Exception e) {
            throw new ServiceException("Error with proxy description: " + persistentClassName + '/' + entityName + " and id: " + id, e);
        }
    }
File
ProxyFactory.java
Developer's decision
Version 1
Kind of conflict
Catch clause
Chunk
Conflicting content 
        }

        if (type == null) {
<<<<<<< HEAD
            PropertyDescriptor[] propertyDescriptors = Introspector.getPropertyDescriptors(persistentClass);

=======
            PropertyDescriptor[] propertyDescriptors = null;
            try {
                BeanInfo beanInfo = Introspector.getBeanInfo(persistentClass);
                propertyDescriptors = beanInfo.getPropertyDescriptors();
            } 
            catch (Exception e) {
                throw new IllegalArgumentException("Could not find id in: " + persistentClass, e);
            }
            
>>>>>>> 5051be4ab02d6e040ab8855ae50c0d1ac9034e9f
            for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
                Method method = propertyDescriptor.getReadMethod();
                if (method != null && (
Solution content 
        }

        if (type == null) {
            PropertyDescriptor[] propertyDescriptors = Introspector.getPropertyDescriptors(persistentClass);

            for (PropertyDescriptor propertyDescriptor : propertyDescriptors) {
                Method method = propertyDescriptor.getReadMethod();
                if (method != null && (
File
ProxyFactory.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Try statement
Variable
Chunk
Conflicting content 
	@Override
	protected String setProperties(Properties props) {
		return "hibernate";
<<<<<<< HEAD
	}
	
=======
	}	
>>>>>>> 5051be4ab02d6e040ab8855ae50c0d1ac9034e9f
    
    @Test
    public void testSerializationProxy3() throws Exception {
Solution content 
	@Override
	protected String setProperties(Properties props) {
		return "hibernate";
	}
    
    @Test
    public void testSerializationProxy3() throws Exception {
File
Hibernate3ExternalizerTest.java
Developer's decision
Version 1
Kind of conflict
Other
Chunk
Conflicting content 
import java.util.ArrayList;
import java.util.Collections;
<<<<<<< HEAD
import java.util.Iterator;
import java.util.List;
=======
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
>>>>>>> 5051be4ab02d6e040ab8855ae50c0d1ac9034e9f

import org.granite.gravity.Gravity;
import org.granite.logging.Logger;
Solution content 
import java.util.ArrayList;
import java.util.Collections;
import java.util.IdentityHashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

import org.granite.gravity.Gravity;
import org.granite.logging.Logger;
File
DataContext.java
Developer's decision
Version 2
Kind of conflict
Import