Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libjitsi
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ZRTP
libjitsi
Commits
c783c65a
Commit
c783c65a
authored
11 years ago
by
Emil Ivov
Browse files
Options
Downloads
Patches
Plain Diff
Makes it possible to override mutability of properties from the overrides file.
parent
2d37cbb1
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
+9
-1
9 additions, 1 deletion
...rg/jitsi/impl/configuration/ConfigurationServiceImpl.java
with
9 additions
and
1 deletion
src/org/jitsi/impl/configuration/ConfigurationServiceImpl.java
+
9
−
1
View file @
c783c65a
...
@@ -64,7 +64,7 @@ public class ConfigurationServiceImpl
...
@@ -64,7 +64,7 @@ public class ConfigurationServiceImpl
* for any of the default properties.
* for any of the default properties.
*/
*/
private
static
final
String
DEFAULT_OVERRIDES_PROPS_FILE_NAME
private
static
final
String
DEFAULT_OVERRIDES_PROPS_FILE_NAME
=
"jitsi-default-overrides.properties"
;
=
"jitsi-default-overrides.properties"
;
/**
/**
* A reference to the currently used configuration file.
* A reference to the currently used configuration file.
...
@@ -1587,11 +1587,19 @@ private void loadDefaultProperties(String fileName)
...
@@ -1587,11 +1587,19 @@ private void loadDefaultProperties(String fileName)
//it seems that we have a valid default immutable property
//it seems that we have a valid default immutable property
immutableDefaultProperties
.
put
(
name
,
value
);
immutableDefaultProperties
.
put
(
name
,
value
);
//in case this is an override, make sure we remove previous
//definitions of this property
defaultProperties
.
remove
(
name
);
}
}
else
else
{
{
//this property is a regular, mutable default property.
//this property is a regular, mutable default property.
defaultProperties
.
put
(
name
,
value
);
defaultProperties
.
put
(
name
,
value
);
//in case this is an override, make sure we remove previous
//definitions of this property
immutableDefaultProperties
.
remove
(
name
);
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment