Well I managed to workaround the issue by updating my symlinks. Here's what I did:
>cd /System/Library/Frameworks/JavaVM.framework/Versions
>ls -l
total 72
lrwxr-xr-x 1 root wheel 10 Oct 18 16:41 1.4 -> CurrentJDK
lrwxr-xr-x 1 root wheel 10 Oct 18 16:41 1.4.2 -> CurrentJDK
lrwxr-xr-x 1 root wheel 10 Oct 18 16:41 1.5 -> CurrentJDK
lrwxr-xr-x 1 root wheel 10 Oct 18 16:41 1.5.0 -> CurrentJDK
lrwxr-xr-x 1 root wheel 10 Oct 18 16:41 1.6 -> CurrentJDK
lrwxr-xr-x 1 root wheel 10 Oct 18 16:41 1.6.0 -> CurrentJDK
drwxr-xr-x 8 root wheel 272 Oct 18 16:42 A
lrwxr-xr-x 1 root wheel 10 Oct 18 17:18 Current -> A
lrwxr-xr-x 1 root wheel 59 Oct 18 16:41 CurrentJDK -> /System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents
>sudo mv Current Current.bak
>sudo ln -s CurrentJDK Current
>java -version
java version "1.6.0_37"Java(TM) SE Runtime Environment (build 1.6.0_37-b06-434-11M3909)Java HotSpot(TM) 64-Bit Server VM (build 20.12-b01-434, mixed mode)
This changes the 'Current' symlink to point to the same version that 'CurrentJDK' is pointing to. This may or may not be the same on your system, so double check. This may or may not cause other problems, but so far I haven't seen any.
ITo undo the changes, just go back to the same directory and:
>sudo rm Current
>sudo mv Current.bak Current
Hope this helps!