15 days visa free for Malaysians

We, 10 of us, will be traveling to China this coming November. After 12 days in China, we will join Royal Caribbean cruise embark from Shanghai for 5 nights to japan. After the cruise, we disembark back in Shanghai again. Is embark from Shanghai is exiting China and disembark in Shanghai again is entering China and another 15 days visa free applied?