From bb25b8312c183c44b7d771726803093bf22f71e4 Mon Sep 17 00:00:00 2001 From: Abraham Elmahrek Date: Sun, 23 Nov 2014 21:38:34 -0800 Subject: [PATCH] SQOOP-1784: Sqoop2: Sending POST request to link or job end-point might end up with NPE (Jarek Jarcec Cecho via Abraham Elmahrek) --- .../main/java/org/apache/sqoop/handler/JobRequestHandler.java | 3 ++- .../main/java/org/apache/sqoop/handler/LinkRequestHandler.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java index 6e3983e8..75a069a2 100644 --- a/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/JobRequestHandler.java @@ -153,7 +153,6 @@ private JsonBean createUpdateJob(RequestContext ctx, boolean create) { Repository repository = RepositoryManager.getInstance().getRepository(); - String username = ctx.getUserName(); JobBean bean = new JobBean(); try { @@ -163,6 +162,8 @@ private JsonBean createUpdateJob(RequestContext ctx, boolean create) { throw new SqoopException(ServerError.SERVER_0003, "Can't read request content", e); } + String username = ctx.getUserName(); + // Get job object List jobs = bean.getJobs(); diff --git a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java index 9a81832d..d2d080bb 100644 --- a/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java +++ b/server/src/main/java/org/apache/sqoop/handler/LinkRequestHandler.java @@ -108,7 +108,6 @@ private JsonBean createUpdateLink(RequestContext ctx, boolean create) { Repository repository = RepositoryManager.getInstance().getRepository(); - String username = ctx.getUserName(); LinkBean linkBean = new LinkBean(); try { JSONObject postData = (JSONObject) JSONValue.parse(ctx.getRequest().getReader()); @@ -117,6 +116,8 @@ private JsonBean createUpdateLink(RequestContext ctx, boolean create) { throw new SqoopException(ServerError.SERVER_0003, "Can't read request content", e); } + String username = ctx.getUserName(); + // Get link object List links = linkBean.getLinks(); if (links.size() != 1) {