Merged srg throttle async reply fix jdev_excrep-stable
authorJakub Lehotsky <jlehotsky@netbeans.org>
Tue, 15 Mar 2016 09:41:32 +0100
branchjdev_excrep-stable
changeset 6299f2c7acf7ab91
parent 6296 d6d331886c08
parent 6298 83198d3e065b
child 6300 1a9c3c714b92
child 6303 4ed58d0e0fd9
Merged srg throttle async reply fix
     1.1 --- a/logger/uihandlerserver/src/java/org/netbeans/server/uihandler/DbInsertion.java	Thu Mar 03 17:26:12 2016 +0100
     1.2 +++ b/logger/uihandlerserver/src/java/org/netbeans/server/uihandler/DbInsertion.java	Tue Mar 15 09:41:32 2016 +0100
     1.3 @@ -275,6 +275,7 @@
     1.4          
     1.5          if (reportThrottle.checkReportForThrottle(thisTask.getTaskEntityManager(), thrown)) {
     1.6              INSERTION_LOG.info("Throttling report"); // NOI18N
     1.7 +            processAsyncRequestReply(reportThrottle.getThrottledReport(), "THROTTLED");
     1.8              if(!isCleanupProcessing.getAndSet(true)){
     1.9                      timer.schedule(new DbInsertion.CleanupTask(), 0, CLEANUP_TASK_INTERVAL);
    1.10                  }            
    1.11 @@ -378,7 +379,7 @@
    1.12                  });
    1.13  
    1.14                  if (!reopen && submit.getReportId().isInIssuezilla()) {
    1.15 -                    processAsyncRequestReply(submit, "EXISTS");
    1.16 +                    processAsyncRequestReply(submit.getReportId(), "EXISTS");
    1.17                  }
    1.18                  
    1.19                  if (!reopen){
    1.20 @@ -391,7 +392,7 @@
    1.21                  }
    1.22              } else {
    1.23                  // TODO: async reply that bug filing is turned off!
    1.24 -                processAsyncRequestReply(submit, "NOBUGFILING");
    1.25 +                processAsyncRequestReply(submit.getReportId(), "NOBUGFILING");
    1.26                  INSERTION_LOG.info("Bug filing is turned off, skipping reopen check."); // NOI18N
    1.27              }
    1.28          }
    1.29 @@ -407,7 +408,7 @@
    1.30          
    1.31      }
    1.32  
    1.33 -    private void processAsyncRequestReply(Submit submit, String action) {
    1.34 +    private void processAsyncRequestReply(Report report, String action) {
    1.35          try {
    1.36              // Let's try to make async processing
    1.37              if (thisTask.isAsyncProcessing()) {
    1.38 @@ -416,8 +417,8 @@
    1.39                  ServletRequest request = asyncContext.getRequest();
    1.40                  ServletResponse response = asyncContext.getResponse();
    1.41                  request.setAttribute("action", action);
    1.42 -                request.setAttribute("reportNo", submit.getReportId().getId());
    1.43 -                request.setAttribute("bugNo", submit.getReportId().getIssueId());
    1.44 +                request.setAttribute("reportNo", report.getId());
    1.45 +                request.setAttribute("bugNo", report.getIssueId());
    1.46                  request.getRequestDispatcher("/uploadredirect.jsp").forward(request, response); // NOI18N
    1.47                  asyncContext.complete();
    1.48              }