Projects >> mango >>0827fb312d7fcc58eb0147f3c08ea03f8ed93ac5

Chunk
Conflicting content
            value = new AlphanumericValue(s);
            break;
        case (DataTypes.IMAGE):
<<<<<<< HEAD
            value = new ImageValue(Integer.parseInt(rs.getString(firstParameter + 2)), rs.getInt(firstParameter + 1));
=======
        	// changed second parameter on imagevalue constructor from column 4 to 2. seems like a bug, was preventing image type from being assigned correctly.
        	// get the timestamp also to determine the year, which is part of the filedata path
            value = new ImageValue(Integer.parseInt(rs.getString(firstParameter + 2)), rs.getInt(firstParameter + 1), rs.getLong(firstParameter + 4));
>>>>>>> c118bd2aa29bf04334c6c58fad460bebd46da41d
            break;
        default:
            value = null;
Solution content
            value = new AlphanumericValue(s);
            break;
        case (DataTypes.IMAGE):
            value = new ImageValue(Integer.parseInt(rs.getString(firstParameter + 2)), rs.getInt(firstParameter + 1), rs.getLong(firstParameter + 4));
            break;
        default:
            value = null;
File
PointValueDao.java
Developer's decision
Combination
Kind of conflict
Comment
Method invocation
Variable