RESOLVIDO: Problemas com datas, Date e Timestamp

public Date valData(String data) {
        SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy");
        try {
            sdf.setLenient(false);//valida data
            return sdf.parse(data);
        } catch (ParseException ex) {
            javax.swing.JOptionPane.showMessageDialog(null, "Data Invalida", "ERRO", javax.swing.JOptionPane.ERROR_MESSAGE);
            return null;
        }

    }

Session session = getHibernateDao().getCurrentSession();
		Criteria criteria = session.createCriteria( Envio.class );
...

                if( dataFimEnvio != null )
		{
			Calendar cal = Calendar.getInstance();
		 if(dataFimEnvio.equals(dataIniEnvio)){
			cal.setTime(dataFimEnvio);
			cal.add(Calendar.DAY_OF_MONTH,1);
			dataFimEnvio = cal.getTime();
		 }
			criteria.add( Restrictions.le("dataEnvio", dataFimEnvio) );
		}
		
		return criteria.list();