Question for Naha District Immigration Office, Kadena Branch

I am a foreigner living in japan for 10 years. May 11 I will be getting married to Japanese but my Long Term Visa (3years) expires June 16.....do I have enough time to Re-new my Visa??