Oil rises on China demand hopes, concerns on supply outlook