add validation for obj_actions also

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@92154 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-sys/ibase/webitm/ejb/sys/UserRightsPrc.java

@@ -332,14 +332,15 @@ public class UserRightsPrc extends ProcessEJB implements  UserRightsPrcLocal , U
 		{
 			try
 			{
-				rs.close();
-				rs = null;
+				if(rs != null){rs.close();// added by akhilesh on 08/nov/12
+				rs = null;}
 				
-				pstmt.close();
-				pstmt = null;
+				if(pstmt != null){pstmt.close();// added by akhilesh on 08/nov/12
+				pstmt = null;}
+
+				if(conn != null){conn.close();// added by akhilesh on 08/nov/12
+				conn = null;}
 				
-				conn.close();
-				conn = null;
 			}
 			catch(Exception e){
 				throw new ITMException(e);// added by akhilesh on 31/oct/12
@@ -398,6 +399,7 @@ public class UserRightsPrc extends ProcessEJB implements  UserRightsPrcLocal , U
 		java.sql.Timestamp orderDate = new java.sql.Timestamp(System.currentTimeMillis());
 		java.sql.Timestamp udfDate = null;
 		ArrayList relArray = new ArrayList(); // added by akhilesh on 31/oct/12
+		ArrayList relArray1 = new ArrayList(); // added by akhilesh on 07/nov/12
 		String returnString = "";
 
 		//Declaring fields of the table User_Rights
@@ -587,7 +589,24 @@ public class UserRightsPrc extends ProcessEJB implements  UserRightsPrcLocal , U
 							pSelectStmt.close();
 							pSelectStmt = null;
 							
-							if(!(relArray.contains(rights) || "*".equals(rights)))
+							// added by akhilesh on 07/nov/12
+							String selectSql1 = "SELECT DISTINCT (RIGHTS_CHAR) FROM OBJ_ACTIONS WHERE OBJ_NAME = ?";
+							pSelectStmt =conn.prepareStatement(selectSql1);
+							pSelectStmt.setString(1,objName);
+							rs = pSelectStmt.executeQuery();
+							while(rs.next())
+							{
+								relArray1.add(rs.getString(1));
+							}
+							System.out.println("relArray and rights value"+relArray1+""+rights);		
+							
+							rs.close();
+							rs = null;
+							pSelectStmt.close();
+							pSelectStmt = null;
+							//ended by akhilesh	
+							
+							if(!(relArray1.contains(rights) || relArray.contains(rights) || "*".equals(rights)))
 							{
 								System.out.println("r************"+relArray+""+rights);		
 								returnString="VTRIGHT";