Commit 2a7d2f7d authored by filatov's avatar filatov
Browse files

remove constant recalculation in fx_GetCurrentTime

parent 1cada3ed

javasrc/extfunc/org/etsi/its/extfunc/ItsExternalFunctionsProvider.java

+4 −14
Original line number Original line Diff line number Diff line
@@ -10,9 +10,6 @@ import java.io.IOException; 
import java.math.BigInteger;

import java.math.BigInteger;

import java.net.InetAddress;

import java.net.InetAddress;

import java.net.UnknownHostException;

import java.net.UnknownHostException;

import java.text.DateFormat;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.time.ZoneOffset;

import java.time.ZoneOffset;

import java.time.ZonedDateTime;

import java.time.ZonedDateTime;

import java.util.ArrayList;

import java.util.ArrayList;
@@ -112,20 +109,13 @@ public class ItsExternalFunctionsProvider implements IItsExternalFunctionsProvid 
            now = _tcicdWrapper.setInteger(GNSS.getGpsTime());

            now = _tcicdWrapper.setInteger(GNSS.getGpsTime());

        }

        }

        else {

        else {

        String datestr="01/01/2004 00:00:00 +0000";

        DateFormat formatter = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss Z");

        try {

//            TERFactory.getInstance().logDebug("ItsExternalFunctionsProvider.fx_getCurrentTime: " + ((java.util.Date)formatter.parse(datestr)).getTime());

//            TERFactory.getInstance().logDebug("ItsExternalFunctionsProvider.fx_getCurrentTime: " + ((java.util.Date)formatter.parse(datestr)).getTime());

            now = _tcicdWrapper.setInteger(

            now = _tcicdWrapper.setInteger(

                new BigInteger(

                new BigInteger(

                    1, 

                    1, 

                    ByteHelper.longToByteArray(System.currentTimeMillis() - ((java.util.Date)formatter.parse(datestr)).getTime(), Long.SIZE / Byte.SIZE)

                    ByteHelper.longToByteArray(System.currentTimeMillis() - ITS_REF_TIME, Long.SIZE / Byte.SIZE)

                )

                )

            );

            );

        } catch (ParseException e) {

            now = _tcicdWrapper.setInteger(0);

        }

        

	        //TERFactory.getInstance().logDebug("ItsExternalFunctionsProvider", "fx_getCurrentTime", String.format("%10d", _tcicdWrapper.getBigInteger(now))); 

	        //TERFactory.getInstance().logDebug("ItsExternalFunctionsProvider", "fx_getCurrentTime", String.format("%10d", _tcicdWrapper.getBigInteger(now))); 

        }

        }

        return now;

        return now;