diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java index 2e0e0118f..26e83d423 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/MutableObjectId.java @@ -71,11 +71,7 @@ public MutableObjectId() { * original entry, to copy id from */ MutableObjectId(MutableObjectId src) { - this.w1 = src.w1; - this.w2 = src.w2; - this.w3 = src.w3; - this.w4 = src.w4; - this.w5 = src.w5; + fromObjectId(src); } /** Make this id match {@link ObjectId#zeroId()}. */ @@ -87,6 +83,20 @@ public void clear() { w5 = 0; } + /** + * Copy an ObjectId into this mutable buffer. + * + * @param src + * the source id to copy from. + */ + public void fromObjectId(AnyObjectId src) { + this.w1 = src.w1; + this.w2 = src.w2; + this.w3 = src.w3; + this.w4 = src.w4; + this.w5 = src.w5; + } + /** * Convert an ObjectId from raw binary representation. * diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java index 25b4f569c..13985e78e 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/PackIndex.java @@ -281,11 +281,7 @@ public ObjectId toObjectId() { public MutableEntry cloneEntry() { final MutableEntry r = new MutableEntry(); ensureId(); - r.idBuffer.w1 = idBuffer.w1; - r.idBuffer.w2 = idBuffer.w2; - r.idBuffer.w3 = idBuffer.w3; - r.idBuffer.w4 = idBuffer.w4; - r.idBuffer.w5 = idBuffer.w5; + r.idBuffer.fromObjectId(idBuffer); r.offset = offset; return r; }