Index: applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java
===================================================================
--- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java	(revision 35720)
+++ applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfReader.java	(revision 35825)
@@ -103,5 +103,5 @@
             if (info.hasTimestamp()) {
                 checkTimestamp(info.getTimestamp());
-                osm.setTimestamp(getDate(info));
+                osm.setInstant(getDate(info).toInstant());
             }
         }
@@ -173,5 +173,5 @@
                                 timestamp += info.getTimestamp(i);
                                 checkTimestamp(timestamp);
-                                nd.setTimestamp(new Date(date_granularity * timestamp));
+                                nd.setInstant(new Date(date_granularity * timestamp).toInstant());
                             }
                         }
@@ -365,4 +365,5 @@
     }
 
+    @SuppressWarnings("resource")
     public void parse(InputStream source) throws IOException, IllegalDataException {
         new BlockInputStream(source, parser).process();
Index: applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java
===================================================================
--- applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 35720)
+++ applications/editors/josm/plugins/pbf/src/org/openstreetmap/josm/plugins/pbf/io/PbfWriter.java	(revision 35825)
@@ -21,4 +21,5 @@
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
+import org.openstreetmap.josm.tools.Logging;
 
 import crosby.binary.BinarySerializer;
@@ -126,5 +127,5 @@
                     int uid = e.getUser() == null ? -1 : (int) e.getUser().getId();
                     int userSid = stable.getIndex(getUserId(e));
-                    int timestamp = (int) (e.getTimestamp().getTime() / date_granularity);
+                    int timestamp = (int) (e.getInstant().toEpochMilli() / date_granularity);
                     int version = e.getVersion();
                     long changeset = e.getChangesetId();
@@ -150,5 +151,5 @@
                         b.setUserSid(stable.getIndex(e.getUser().getName()));
                     }
-                    b.setTimestamp((int) (e.getTimestamp().getTime() / date_granularity));
+                    b.setTimestamp((int) (e.getInstant().toEpochMilli() / date_granularity));
                     b.setVersion(e.getVersion());
                     b.setChangeset(e.getChangesetId());
@@ -435,4 +436,5 @@
             } else {
                 // No data. Is this an empty file?
+                Logging.debug("No PBF data. Is this an empty file?");
             }
         }