From 88168c6d603833a7033af973af0282dc7056d7ef Mon Sep 17 00:00:00 2001 From: Chris Price Date: Tue, 7 Jul 2015 12:30:06 +0100 Subject: [PATCH] Use local variable in RepositoryTestCase.indexState There is a signature of the test helper method `indexState`, in `RepositoryTestCase`, that accepts a `Repository` object as an argument. However, there was one line of code where this variable was not being used, and the method was instead referring to a member variable `db`. I believe this was probably just an oversight in a previous refactor, and that the correct behavior is to use the variable from the argument list. This change also has the benefit of making it possible to convert this method to a static method, since it no longer relies on any state from the class. Bug: 436200 Change-Id: Iac95b046dc5bd0b3756642e241c3637f1fad3609 Signed-off-by: Chris Price --- .../src/org/eclipse/jgit/junit/RepositoryTestCase.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java index 83148d000..f9eb7b4ea 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/RepositoryTestCase.java @@ -238,7 +238,7 @@ public String indexState(Repository repo, int includedOptions) sb.append(", sha1:" + ObjectId.toString(entry.getObjectId())); if (0 != (includedOptions & CONTENT)) { sb.append(", content:" - + new String(db.open(entry.getObjectId(), + + new String(repo.open(entry.getObjectId(), Constants.OBJ_BLOB).getCachedBytes(), "UTF-8")); } if (0 != (includedOptions & ASSUME_UNCHANGED))