Skip to content

Commit

Permalink
merge in master
Browse files Browse the repository at this point in the history
  • Loading branch information
robotdan committed Jan 31, 2025
2 parents 1228d7a + f24dbfb commit 402f038
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
~ Copyright (c) 2023, FusionAuth, All Rights Reserved
~ Copyright (c) 2023-2025, FusionAuth, All Rights Reserved
--><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

Expand Down
4 changes: 2 additions & 2 deletions prime-mvc.iml
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,11 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/.savant/cache/io/fusionauth/java-http/0.4.0-RC.3/java-http-0.4.0-RC.3.jar!/" />
<root url="jar://$MODULE_DIR$/.savant/cache/io/fusionauth/java-http/0.4.0-RC.4/java-http-0.4.0-RC.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MODULE_DIR$/.savant/cache/io/fusionauth/java-http/0.4.0-RC.3/java-http-0.4.0-RC.3-src.jar!/" />
<root url="jar://$MODULE_DIR$/.savant/cache/io/fusionauth/java-http/0.4.0-RC.4/java-http-0.4.0-RC.4-src.jar!/" />
</SOURCES>
</library>
</orderEntry>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2023, Inversoft Inc., All Rights Reserved
* Copyright (c) 2012-2025, Inversoft Inc., All Rights Reserved
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,8 +34,6 @@ public class RequestSimulator {

public final TestPrimeMainThread thread;

public final MockUserAgent userAgent;

public int actualPort = -1;

public int port;
Expand All @@ -44,6 +42,8 @@ public class RequestSimulator {

public boolean useTLS;

public MockUserAgent userAgent;

/**
* Creates a new request simulator that can be used to simulate requests to a Prime application.
*
Expand Down Expand Up @@ -112,7 +112,7 @@ public int getPort() {

public void reset() {
actualPort = -1;
userAgent.clearAllCookies();
userAgent = new MockUserAgent();
useTLS = false;
}

Expand Down

0 comments on commit 402f038

Please sign in to comment.