[ignite-teamcity-bot] branch master updated: Fix compilation because of merge issue

[dp...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dpavlov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite-teamcity-bot.git


The following commit(s) were added to refs/heads/master by this push:
     new fb51cdb  Fix compilation because of merge issue
fb51cdb is described below

commit fb51cdb9e23ac819e9195a94d5e25e864eaf2621
Author: Dmitriy Pavlov <dp...@apache.org>
AuthorDate: Sat Nov 3 22:42:29 2018 +0300

    Fix compilation because of merge issue
---
 .../java/org/apache/ignite/ci/web/rest/issues/TcIssues.java   | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/issues/TcIssues.java b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/issues/TcIssues.java
index 586f7f9..1676069 100644
--- a/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/issues/TcIssues.java
+++ b/ignite-tc-helper-web/src/main/java/org/apache/ignite/ci/web/rest/issues/TcIssues.java
@@ -17,17 +17,17 @@
 
 package org.apache.ignite.ci.web.rest.issues;
 
-import org.apache.ignite.ci.HelperConfig;
 import org.apache.ignite.ci.ITcHelper;
-import org.apache.ignite.ci.conf.BranchTracked;
 import org.apache.ignite.ci.issue.IssueList;
 import org.apache.ignite.ci.issue.IssuesStorage;
+import org.apache.ignite.ci.user.ICredentialsProv;
 import org.apache.ignite.ci.web.CtxListener;
 import org.apache.ignite.ci.web.model.SimpleResult;
 import org.apache.ignite.ci.web.model.current.UpdateInfo;
 import org.jetbrains.annotations.Nullable;
 
 import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
@@ -43,7 +43,10 @@ public class TcIssues {
     public static final String ISSUES = "issues";
 
     @Context
-    private ServletContext context;
+    private ServletContext ctx;
+
+    @Context
+    private HttpServletRequest req;
 
     @GET
     @Path("updates")
@@ -59,7 +62,7 @@ public class TcIssues {
     public IssueList listIssues(@Nullable @QueryParam("branch") String branchOpt,
                                 @Nullable @QueryParam("count") Integer count,
                                 @Nullable @QueryParam("checkAllLogs") Boolean checkAllLogs) {
-        final ITcHelper helper = CtxListener.getTcHelper(context);
+        final ITcHelper helper = CtxListener.getTcHelper(ctx);
 
         final String branch = isNullOrEmpty(branchOpt) ? "master" : branchOpt;