In Barcelona, Nadal Dodges Upset