summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2014-11-10 18:18:34 -0800
committerStefan Beller <sbeller@google.com>2014-11-10 18:18:34 -0800
commit423ad8b0ad0d6aba2be38064a7a66f893747dd63 (patch)
treedbe9618654244603c2e36d8cca893320321b4e8f /org.eclipse.jgit
parent0cf902e47370bfb5360f6d5b46bc14e203f37d71 (diff)
downloadjgit-423ad8b0ad0d6aba2be38064a7a66f893747dd63.tar.gz
jgit-423ad8b0ad0d6aba2be38064a7a66f893747dd63.zip
Fix variable name and error message for sideband testing
Actually the test only allows a range from [1,255], so let's name the variable so. Change-Id: Iecdb8149b83389c67e3cd2f64f4a654c175475be Signed-off-by: Stefan Beller <sbeller@google.com>
Diffstat (limited to 'org.eclipse.jgit')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java2
-rw-r--r--org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java4
3 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
index 524aa3e6ac..76c709422e 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -91,7 +91,7 @@ canOnlyRevertCommitsWithOneParent=Cannot revert commit ''{0}'' because it has {1
commitDoesNotHaveGivenParent=The commit ''{0}'' does not have a parent number {1}.
cantFindObjectInReversePackIndexForTheSpecifiedOffset=Can''t find object in (reverse) pack index for the specified offset {0}
cantPassMeATree=Can't pass me a tree!
-channelMustBeInRange0_255=channel {0} must be in range [0, 255]
+channelMustBeInRange1_255=channel {0} must be in range [1, 255]
characterClassIsNotSupported=The character class {0} is not supported.
checkoutConflictWithFile=Checkout conflict with file: {0}
checkoutConflictWithFiles=Checkout conflict with files: {0}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
index dd1be0d5f7..d1f0deec9d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java
@@ -150,7 +150,7 @@ public class JGitText extends TranslationBundle {
/***/ public String commitDoesNotHaveGivenParent;
/***/ public String cantFindObjectInReversePackIndexForTheSpecifiedOffset;
/***/ public String cantPassMeATree;
- /***/ public String channelMustBeInRange0_255;
+ /***/ public String channelMustBeInRange1_255;
/***/ public String characterClassIsNotSupported;
/***/ public String checkoutConflictWithFile;
/***/ public String checkoutConflictWithFiles;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java
index 770fcbed82..0303eed9a7 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/SideBandOutputStream.java
@@ -93,7 +93,7 @@ public class SideBandOutputStream extends OutputStream {
* @param chan
* channel number to prefix all packets with, so the remote side
* can demultiplex the stream and get back the original data.
- * Must be in the range [0, 255].
+ * Must be in the range [1, 255].
* @param sz
* maximum size of a data packet within the stream. The remote
* side needs to agree to the packet size to prevent buffer
@@ -105,7 +105,7 @@ public class SideBandOutputStream extends OutputStream {
public SideBandOutputStream(final int chan, final int sz, final OutputStream os) {
if (chan <= 0 || chan > 255)
throw new IllegalArgumentException(MessageFormat.format(
- JGitText.get().channelMustBeInRange0_255,
+ JGitText.get().channelMustBeInRange1_255,
Integer.valueOf(chan)));
if (sz <= HDR_SIZE)
throw new IllegalArgumentException(MessageFormat.format(