Fix locking problems and variable initialization bugs; remove redundant code

git-svn-id: svn://irodssvn.ucsd.edu/trunk@5405 ea137bd6-aa86-47b6-b90d-b101d9f19a90