Projects >> flip >>ca6f3e0e8e70cf82cb0c63e2475dba15a454a9f7

Chunk
Conflicting content
        }
        catch (final NumberFormatException ex)
        {
<<<<<<< HEAD
            Logger.getLogger(XmlPropertyReader.class.getName()).log(Level.WARNING, 
                    String.format("The property [%s] in feature service properties is missing or has an invalid format.", CONFIG_REREAD_INTERVAL));
=======
            Logger.getLogger(XmlPropertyReader.class.getName()).log(Level.WARNING,
            		String.format("The property [%s] in feature service properties is missing or has an invalid format.",
            				CONFIG_REREAD_INTERVAL));
>>>>>>> 623f0ccfefe9fc976194b401123014b435a92172
        }
    }
Solution content
        }
        catch (final NumberFormatException ex)
        {
            Logger.getLogger(XmlPropertyReader.class.getName()).log(Level.WARNING, 
                    String.format("The property [%s] in feature service properties is missing or has an invalid format.", CONFIG_REREAD_INTERVAL));
        }
    }
File
RefreshablePropertyReader.java
Developer's decision
Version 1
Kind of conflict
Method invocation