From 1ec393e744cd16956cd800c9a56fcae19e150241 Mon Sep 17 00:00:00 2001
From: "Shawn O. Pearce" <spearce@spearce.org>
Date: Mon, 28 Dec 2009 15:55:49 -0800
Subject: [PATCH] Use Constants.OBJECT_ID_STRING_LENGTH instead of LEN * 2
A few locations were doing OBJECT_ID_LENGTH * 2 on their own, as
the old STR_LEN constant wasn't visible. Replace them with the
new public constant OBJECT_ID_STRING_LENGTH.
Change-Id: Id39bddb52de8c65bb097de042e9d4ed99598201f
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java | 2 +-
org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java | 4 ++--
org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java | 4 ++--
.../src/org/eclipse/jgit/transport/BundleWriter.java | 2 +-
.../src/org/eclipse/jgit/transport/ReceivePack.java | 2 +-
.../src/org/eclipse/jgit/transport/RefAdvertiser.java | 2 +-
.../org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java | 2 +-
7 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java
index 9d2576127..b6da244e8 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/LockFile.java
@@ -210,7 +210,7 @@ public void write(final ObjectId id) throws IOException {
requireLock();
try {
final BufferedOutputStream b;
- b = new BufferedOutputStream(os, Constants.OBJECT_ID_LENGTH * 2 + 1);
+ b = new BufferedOutputStream(os, Constants.OBJECT_ID_STRING_LENGTH + 1);
id.copyTo(b);
b.write('\n');
b.flush();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java
index 447acac8a..704cbc052 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/RefWriter.java
@@ -83,7 +83,7 @@ public RefWriter(Collection<Ref> refs) {
*/
public void writeInfoRefs() throws IOException {
final StringWriter w = new StringWriter();
- final char[] tmp = new char[Constants.OBJECT_ID_LENGTH * 2];
+ final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH];
for (final Ref r : refs) {
if (Constants.HEAD.equals(r.getName())) {
// Historically HEAD has never been published through
@@ -137,7 +137,7 @@ public void writePackedRefs() throws IOException {
w.write('\n');
}
- final char[] tmp = new char[Constants.OBJECT_ID_LENGTH * 2];
+ final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH];
for (final Ref r : refs) {
if (r.getStorage() != Ref.Storage.PACKED)
continue;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java
index abfeefaa1..b394f34bb 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/ReflogReader.java
@@ -72,12 +72,12 @@ static public class Entry {
Entry(byte[] raw, int pos) {
oldId = ObjectId.fromString(raw, pos);
- pos += Constants.OBJECT_ID_LENGTH * 2;
+ pos += Constants.OBJECT_ID_STRING_LENGTH;
if (raw[pos++] != ' ')
throw new IllegalArgumentException(
"Raw log message does not parse as log entry");
newId = ObjectId.fromString(raw, pos);
- pos += Constants.OBJECT_ID_LENGTH * 2;
+ pos += Constants.OBJECT_ID_STRING_LENGTH;
if (raw[pos++] != ' ') {
throw new IllegalArgumentException(
"Raw log message does not parse as log entry");
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
index 92d07e128..db1312ca3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/BundleWriter.java
@@ -179,7 +179,7 @@ public void writeBundle(OutputStream os) throws IOException {
w.write(TransportBundle.V2_BUNDLE_SIGNATURE);
w.write('\n');
- final char[] tmp = new char[Constants.OBJECT_ID_LENGTH * 2];
+ final char[] tmp = new char[Constants.OBJECT_ID_STRING_LENGTH];
for (final RevCommit a : assume) {
w.write('-');
a.copyTo(tmp, w);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 6aa64cc46..d87395c1c 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -882,7 +882,7 @@ private void sendStatusReport(final boolean forClient, final Reporter out)
case REJECTED_MISSING_OBJECT:
if (cmd.getMessage() == null)
r.append("missing object(s)");
- else if (cmd.getMessage().length() == 2 * Constants.OBJECT_ID_LENGTH)
+ else if (cmd.getMessage().length() == Constants.OBJECT_ID_STRING_LENGTH)
r.append("object " + cmd.getMessage() + " missing");
else
r.append(cmd.getMessage());
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java
index dfbd891b0..6a6053d94 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/RefAdvertiser.java
@@ -70,7 +70,7 @@ class RefAdvertiser {
private final StringBuilder tmpLine = new StringBuilder(100);
- private final char[] tmpId = new char[2 * Constants.OBJECT_ID_LENGTH];
+ private final char[] tmpId = new char[Constants.OBJECT_ID_STRING_LENGTH];
private final Set<String> capablities = new LinkedHashSet<String>();
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
index de1c7de01..6a010fb4e 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkRemoteObjectDatabase.java
@@ -308,7 +308,7 @@ void deleteRefLog(final String name) throws IOException {
void writeRef(final String name, final ObjectId value) throws IOException {
final ByteArrayOutputStream b;
- b = new ByteArrayOutputStream(Constants.OBJECT_ID_LENGTH * 2 + 1);
+ b = new ByteArrayOutputStream(Constants.OBJECT_ID_STRING_LENGTH + 1);
value.copyTo(b);
b.write('\n');
--
GitLab