From d64cf215630098d7e3f52e994dd277923d35f8e7 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Mon, 24 Aug 2015 10:48:02 -0700 Subject: [PATCH] SQOOP-2522: Sqoop2: Findbugs: Fix warning in security module (Colin Ma via Jarek Jarcec Cecho) --- .../sqoop/security/authorization/AuthorizationEngine.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java b/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java index 358a8bdc..bebbe91d 100644 --- a/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java +++ b/security/src/main/java/org/apache/sqoop/security/authorization/AuthorizationEngine.java @@ -51,7 +51,7 @@ public boolean apply(T input) { checkPrivilege(doUserName, getPrivilege(type, name, MPrivilege.ACTION.READ)); // add valid resource return true; - } catch (Exception e) { + } catch (RuntimeException e) { //do not add into result if invalid resource return false; } @@ -145,7 +145,7 @@ public boolean apply(MSubmission input) { checkPrivilege(doUserName, getPrivilege(MResource.TYPE.JOB, jobId, MPrivilege.ACTION.READ)); // add valid submission return true; - } catch (Exception e) { + } catch (RuntimeException e) { //do not add into result if invalid submission return false; } @@ -176,12 +176,12 @@ private static void checkPrivilege(String doUserName, MPrivilege... privileges) for (MPrivilege privilege : privileges) { Repository repository = RepositoryManager.getInstance().getRepository(); if (MResource.TYPE.LINK.name().equalsIgnoreCase(privilege.getResource().getType())) { - MLink link = repository.findLink(Long.valueOf(privilege.getResource().getName())); + MLink link = repository.findLink(Long.parseLong(privilege.getResource().getName())); if (!doUserName.equals(link.getCreationUser())) { privilegesNeedCheck.add(privilege); } } else if (MResource.TYPE.JOB.name().equalsIgnoreCase(privilege.getResource().getType())) { - MJob job = repository.findJob(Long.valueOf(privilege.getResource().getName())); + MJob job = repository.findJob(Long.parseLong(privilege.getResource().getName())); if (!doUserName.equals(job.getCreationUser())) { privilegesNeedCheck.add(privilege); }