Changeset 18826 in josm for trunk/src/org/openstreetmap

Timestamp:

2023-09-12T18:04:57+02:00 (10 months ago)

Author:

taylor.smock

Message:

Fix #23165: Cannot assign a changesetId > 0 to a new primitive

There were two problems:

1. Using Number.intValue instead of Number.longValue
2. Using >> instead of >>> (bit shift)

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/protobuf/ProtobufParser.java (modified) (2 diffs)
• io/OsmPbfReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/protobuf/ProtobufParser.java

@@ -52 +52 @@
      * @param start    The start position in the byte array
      * @param end      The end position in the byte array (exclusive - [start, end) )
-     * @return t
-     * he number from the byte array. Depending upon length of time the number will be stored, narrowing may be helpful.
+     * @return the number from the byte array. Depending upon length of time the number will be stored, narrowing may be helpful.
      * @since 18695
      */
@@ -101 +100 @@
      */
     public static long decodeZigZag(long signed) {
-        return (signed >> 1) ^ -(signed & 1);
+        return (signed >>> 1) ^ -(signed & 1);
     }
 

trunk/src/org/openstreetmap/josm/io/OsmPbfReader.java

@@ -632 +632 @@
                 switch (protobufRecord.getField()) {
                     case 1:
-                        id = protobufRecord.asUnsignedVarInt().intValue();
+                        id = protobufRecord.asUnsignedVarInt().longValue();
                         break;
                     case 2:
@@ -699 +699 @@
                 switch (protobufRecord.getField()) {
                     case 1:
-                        id = protobufRecord.asUnsignedVarInt().intValue();
+                        id = protobufRecord.asUnsignedVarInt().longValue();
                         break;
                     case 2:
@@ -838 +838 @@
      */
     private static void setOsmPrimitiveData(PrimitiveBlockRecord primitiveBlockRecord, PrimitiveData primitive, Info info) {
-        if (info.changeset() != null) {
-            primitive.setChangesetId(Math.toIntExact(info.changeset()));
-        }
         primitive.setVisible(info.isVisible());
         if (info.timestamp() != null) {
@@ -852 +849 @@
         if (info.version() > 0) {
             primitive.setVersion(info.version());
+        }
+        if (info.changeset() != null) {
+            primitive.setChangesetId(Math.toIntExact(info.changeset()));
         }
     }