Do not rescue OCIError

ebeigarts · Aug 2, 2011 · 7776668 · 7776668
1 parent 51dae6c
commit 7776668
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/lib/oracle_ebs_authentication/authenticator.rb b/lib/oracle_ebs_authentication/authenticator.rb
@@ -18,15 +18,17 @@ def get_fnd_password(username, password)
       if result[:p_password]
         @security.decrypt(username + "/" + password, result[:p_password], false)
       end
-    rescue OCIError
-      nil
+    rescue OCIError => e
+      if e.message.include?("ORA-20001: Your account does not exist or has expired.")
+        nil
+      else
+        raise e
+      end
     end
 
     def get_fnd_user_id(username)
       username &&= username.upcase
       plsql.apps.fnd_security_pkg.fnd_encrypted_pwd(username, nil, nil, nil)[:p_user_id]
-    rescue OCIError
-      nil  
     end
 
     def get_fnd_responsibilities(username)
@@ -36,8 +38,6 @@ def get_fnd_responsibilities(username)
       else
         []
       end
-    rescue OCIError
-      []
     end
 
     def validate_user_password(username, password)