Projects information

Chunk

Conflicting content
protected boolean handleClass(final Class clazz) { try { setFieldValue(object, clazz, fieldName, value); <<<<<<< HEAD return; } catch (final NoSuchFieldException e) { LOG.warn("could not set field " + fieldName + " value " + value, e); ======= return true; } catch (final NoSuchFieldException e) { LOG.debug("could not set field " + fieldName + " value " + value, e); >>>>>>> aa9d371e20371c7a750a04e4a33f26854e064a2e } return false; }

Conflicting content

            protected boolean handleClass(final Class clazz) {
                try {
                    setFieldValue(object, clazz, fieldName, value);
<<<<<<< HEAD
                    return;
                } catch (final NoSuchFieldException e) {
                    LOG.warn("could not set field " + fieldName + " value " + value, e);
=======
                    return true;
                }
                catch (final NoSuchFieldException e) {
                    LOG.debug("could not set field " + fieldName + " value " + value, e);
>>>>>>> aa9d371e20371c7a750a04e4a33f26854e064a2e
                }
                return false;
            }

Solution content
protected boolean handleClass(final Class clazz) { try { setFieldValue(object, clazz, fieldName, value); return true; } catch (final NoSuchFieldException e) { LOG.debug("could not set field " + fieldName + " value " + value, e); } return false; }

Solution content

            protected boolean handleClass(final Class clazz) {
                try {
                    setFieldValue(object, clazz, fieldName, value);
                    return true;
                } catch (final NoSuchFieldException e) {
                    LOG.debug("could not set field " + fieldName + " value " + value, e);

                }
                return false;
            }

File
ReflectionUtil.java

Developer's decision
Version 2

Kind of conflict
Catch clause
Method invocation
Return statement

Chunk

Conflicting content
======= protected boolean handleClass(final Class clazz) { try { result.add(clazz.getDeclaredMethod(methodName, parameterTypes)); <<<<<<< HEAD return; } catch (final Exception e) { return true; } catch (final Exception e) { >>>>>>> aa9d371e20371c7a750a04e4a33f26854e064a2e // do nothing } return false;

Conflicting content

=======
            protected boolean handleClass(final Class clazz) {
                try {
                    result.add(clazz.getDeclaredMethod(methodName, parameterTypes));
<<<<<<< HEAD
                    return;
                } catch (final Exception e) {
                    return true;
                }
                catch (final Exception e) {
>>>>>>> aa9d371e20371c7a750a04e4a33f26854e064a2e
                    // do nothing
                }
                return false;

Solution content
protected boolean handleClass(final Class clazz) { try { result.add(clazz.getDeclaredMethod(methodName, parameterTypes)); return true; } catch (final Exception e) { // do nothing } return false;

File
ReflectionUtil.java

Developer's decision
Version 2

Kind of conflict
Catch clause
Return statement

Projects >> needle >>34d705ef5705df4014ecbfbeec2da14694e900ed